[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 37/39] wdt_i6300esb: use instance_finalize instead o
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 37/39] wdt_i6300esb: use instance_finalize instead of exit |
Date: |
Tue, 4 Jun 2013 20:52:32 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/watchdog/wdt_i6300esb.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c
index 1407fba..b8cfc64 100644
--- a/hw/watchdog/wdt_i6300esb.c
+++ b/hw/watchdog/wdt_i6300esb.c
@@ -411,8 +411,9 @@ static int i6300esb_init(PCIDevice *dev)
return 0;
}
-static void i6300esb_exit(PCIDevice *dev)
+static void i6300esb_instance_finalize(Object *obj)
{
+ PCIDevice *dev = PCI_DEVICE(obj);
I6300State *d = DO_UPCAST(I6300State, dev, dev);
memory_region_destroy(&d->io_mem);
@@ -431,7 +432,6 @@ static void i6300esb_class_init(ObjectClass *klass, void
*data)
k->config_read = i6300esb_config_read;
k->config_write = i6300esb_config_write;
k->init = i6300esb_init;
- k->exit = i6300esb_exit;
k->vendor_id = PCI_VENDOR_ID_INTEL;
k->device_id = PCI_DEVICE_ID_INTEL_ESB_9;
k->class_id = PCI_CLASS_SYSTEM_OTHER;
@@ -444,6 +444,7 @@ static const TypeInfo i6300esb_info = {
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(I6300State),
.class_init = i6300esb_class_init,
+ .instance_finalize = i6300esb_instance_finalize,
};
static void i6300esb_register_types(void)
--
1.8.1.4
- [Qemu-devel] [PATCH 27/39] pci_bridge: split exit and instance_finalize, (continued)
- [Qemu-devel] [PATCH 27/39] pci_bridge: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 28/39] ioh4320: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 29/39] xio3130-downstream: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 30/39] xio3130-upstream: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 31/39] pcie: do not recreate mmcfg I/O region, use an alias instead, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 32/39] esp: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 33/39] lsi: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 34/39] pvscsi: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 35/39] usb-uhci: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 36/39] virtio-pci: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 37/39] wdt_i6300esb: use instance_finalize instead of exit,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 38/39] xen_pt: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 39/39] tpm: move add/del_subregion to realize/unrealize, Paolo Bonzini, 2013/06/04
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Andreas Färber, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Michael S. Tsirkin, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Andreas Färber, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Michael S. Tsirkin, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Andreas Färber, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Michael S. Tsirkin, 2013/06/05
- Re: [Qemu-devel] [PATCH 00/39] Delay destruction of memory regions to instance_finalize, Andreas Färber, 2013/06/05