From c025d0abce5ba2ea0cc6f6695c6703cb449d2b70 Mon Sep 17 00:00:00 2001 From: xiaoqiang zhao Date: Sat, 31 Dec 2016 09:17:19 +0800 Subject: [PATCH 1/5] hw/audio: QOM'ify marvell_88w8618.c split the old SysBus init function into an instance_init and Device realize function Signed-off-by: xiaoqiang zhao Message-id: 20161231011720.3965-2-zxq_yx_007@163.com Signed-off-by: Gerd Hoffmann --- hw/audio/marvell_88w8618.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index a6ca1806be..511b004287 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -241,19 +241,23 @@ static const MemoryRegionOps mv88w8618_audio_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int mv88w8618_audio_init(SysBusDevice *dev) +static void mv88w8618_audio_init(Object *obj) { + SysBusDevice *dev = SYS_BUS_DEVICE(obj); mv88w8618_audio_state *s = MV88W8618_AUDIO(dev); sysbus_init_irq(dev, &s->irq); - wm8750_data_req_set(s->wm, mv88w8618_audio_callback, s); - - memory_region_init_io(&s->iomem, OBJECT(s), &mv88w8618_audio_ops, s, + memory_region_init_io(&s->iomem, obj, &mv88w8618_audio_ops, s, "audio", MP_AUDIO_SIZE); sysbus_init_mmio(dev, &s->iomem); +} - return 0; +static void mv88w8618_audio_realize(DeviceState *dev, Error **errp) +{ + mv88w8618_audio_state *s = MV88W8618_AUDIO(dev); + + wm8750_data_req_set(s->wm, mv88w8618_audio_callback, s); } static const VMStateDescription mv88w8618_audio_vmsd = { @@ -282,9 +286,8 @@ static Property mv88w8618_audio_properties[] = { static void mv88w8618_audio_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = mv88w8618_audio_init; + dc->realize = mv88w8618_audio_realize; dc->reset = mv88w8618_audio_reset; dc->vmsd = &mv88w8618_audio_vmsd; dc->props = mv88w8618_audio_properties; @@ -296,6 +299,7 @@ static const TypeInfo mv88w8618_audio_info = { .name = TYPE_MV88W8618_AUDIO, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(mv88w8618_audio_state), + .instance_init = mv88w8618_audio_init, .class_init = mv88w8618_audio_class_init, }; From 8becab9523f41c575e6befc07d23f1550ed5d213 Mon Sep 17 00:00:00 2001 From: xiaoqiang zhao Date: Sat, 31 Dec 2016 09:17:20 +0800 Subject: [PATCH 2/5] hw/audio: QOM'ify pl041.c split the old SysBus init function into an instance_init and Device realize function Signed-off-by: xiaoqiang zhao Message-id: 20161231011720.3965-3-zxq_yx_007@163.com Signed-off-by: Gerd Hoffmann --- hw/audio/pl041.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c index 6e9c104011..c8cc503236 100644 --- a/hw/audio/pl041.c +++ b/hw/audio/pl041.c @@ -521,12 +521,23 @@ static const MemoryRegionOps pl041_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int pl041_init(SysBusDevice *dev) +static void pl041_init(Object *obj) { + SysBusDevice *dev = SYS_BUS_DEVICE(obj); PL041State *s = PL041(dev); DBG_L1("pl041_init 0x%08x\n", (uint32_t)s); + /* Connect the device to the sysbus */ + memory_region_init_io(&s->iomem, obj, &pl041_ops, s, "pl041", 0x1000); + sysbus_init_mmio(dev, &s->iomem); + sysbus_init_irq(dev, &s->irq); +} + +static void pl041_realize(DeviceState *dev, Error **errp) +{ + PL041State *s = PL041(dev); + /* Check the device properties */ switch (s->fifo_depth) { case 8: @@ -545,18 +556,10 @@ static int pl041_init(SysBusDevice *dev) qemu_log_mask(LOG_UNIMP, "pl041: unsupported non-compact fifo depth [%i]\n", s->fifo_depth); - return -1; } - /* Connect the device to the sysbus */ - memory_region_init_io(&s->iomem, OBJECT(s), &pl041_ops, s, "pl041", 0x1000); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_irq(dev, &s->irq); - /* Init the codec */ lm4549_init(&s->codec, &pl041_request_data, (void *)s); - - return 0; } static const VMStateDescription vmstate_pl041_regfile = { @@ -627,9 +630,8 @@ static Property pl041_device_properties[] = { static void pl041_device_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = pl041_init; + dc->realize = pl041_realize; set_bit(DEVICE_CATEGORY_SOUND, dc->categories); dc->reset = pl041_device_reset; dc->vmsd = &vmstate_pl041; @@ -640,6 +642,7 @@ static const TypeInfo pl041_device_info = { .name = TYPE_PL041, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(PL041State), + .instance_init = pl041_init, .class_init = pl041_device_class_init, }; From 069eb7b2b8fc47c7cb52e5a4af23ea98d939e3da Mon Sep 17 00:00:00 2001 From: Li Qiang Date: Wed, 14 Dec 2016 18:32:22 -0800 Subject: [PATCH 3/5] audio: es1370: add exit function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently the es1370 device emulation doesn't have a exit function, hot unplug this device will leak some memory. Add a exit function to avoid this. Signed-off-by: Li Qiang Reviewed-by: Marc-André Lureau Message-id: 585200c9.a968ca0a.1ab80.4c98@mx.google.com Signed-off-by: Gerd Hoffmann --- hw/audio/es1370.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 8449b5f436..883ec69b30 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -1041,6 +1041,19 @@ static void es1370_realize(PCIDevice *dev, Error **errp) es1370_reset (s); } +static void es1370_exit(PCIDevice *dev) +{ + ES1370State *s = ES1370(dev); + int i; + + for (i = 0; i < 2; ++i) { + AUD_close_out(&s->card, s->dac_voice[i]); + } + + AUD_close_in(&s->card, s->adc_voice); + AUD_remove_card(&s->card); +} + static int es1370_init (PCIBus *bus) { pci_create_simple (bus, -1, TYPE_ES1370); @@ -1053,6 +1066,7 @@ static void es1370_class_init (ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS (klass); k->realize = es1370_realize; + k->exit = es1370_exit; k->vendor_id = PCI_VENDOR_ID_ENSONIQ; k->device_id = PCI_DEVICE_ID_ENSONIQ_ES1370; k->class_id = PCI_CLASS_MULTIMEDIA_AUDIO; From 12351a91da97b414eec8cdb09f1d9f41e535a401 Mon Sep 17 00:00:00 2001 From: Li Qiang Date: Wed, 14 Dec 2016 18:30:21 -0800 Subject: [PATCH 4/5] audio: ac97: add exit function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently the ac97 device emulation doesn't have a exit function, hot unplug this device will leak some memory. Add a exit function to avoid this. Signed-off-by: Li Qiang Reviewed-by: Marc-André Lureau Message-id: 58520052.4825ed0a.27a71.6cae@mx.google.com Signed-off-by: Gerd Hoffmann --- hw/audio/ac97.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index cbd959e0bd..c30657501c 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -1387,6 +1387,16 @@ static void ac97_realize(PCIDevice *dev, Error **errp) ac97_on_reset (&s->dev.qdev); } +static void ac97_exit(PCIDevice *dev) +{ + AC97LinkState *s = DO_UPCAST(AC97LinkState, dev, dev); + + AUD_close_in(&s->card, s->voice_pi); + AUD_close_out(&s->card, s->voice_po); + AUD_close_in(&s->card, s->voice_mc); + AUD_remove_card(&s->card); +} + static int ac97_init (PCIBus *bus) { pci_create_simple (bus, -1, "AC97"); @@ -1404,6 +1414,7 @@ static void ac97_class_init (ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS (klass); k->realize = ac97_realize; + k->exit = ac97_exit; k->vendor_id = PCI_VENDOR_ID_INTEL; k->device_id = PCI_DEVICE_ID_INTEL_82801AA_5; k->revision = 0x01; From 11f547e58a08ea71a8a92d3ffe1e210b4b0b709c Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 10 Jan 2017 14:18:01 +0100 Subject: [PATCH 5/5] es1370: wire up reset via DeviceClass Instead of using qemu_register_reset(). That way we get proper cleanup for free. Signed-off-by: Gerd Hoffmann Message-id: 1484054281-26139-1-git-send-email-kraxel@redhat.com --- hw/audio/es1370.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 883ec69b30..fe64c1ac37 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -1010,9 +1010,9 @@ static const VMStateDescription vmstate_es1370 = { } }; -static void es1370_on_reset (void *opaque) +static void es1370_on_reset(DeviceState *dev) { - ES1370State *s = opaque; + ES1370State *s = container_of(dev, ES1370State, dev.qdev); es1370_reset (s); } @@ -1035,7 +1035,6 @@ static void es1370_realize(PCIDevice *dev, Error **errp) memory_region_init_io (&s->io, OBJECT(s), &es1370_io_ops, s, "es1370", 256); pci_register_bar (&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io); - qemu_register_reset (es1370_on_reset, s); AUD_register_card ("es1370", &s->card); es1370_reset (s); @@ -1075,6 +1074,7 @@ static void es1370_class_init (ObjectClass *klass, void *data) set_bit(DEVICE_CATEGORY_SOUND, dc->categories); dc->desc = "ENSONIQ AudioPCI ES1370"; dc->vmsd = &vmstate_es1370; + dc->reset = es1370_on_reset; } static const TypeInfo es1370_info = {