From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53356) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwM6-0007So-Ly for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwM5-0007ao-HJ for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:14 -0400 Received: from mail-we0-x22f.google.com ([2a00:1450:400c:c03::22f]:59245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwM5-0007aU-CO for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:13 -0400 Received: by mail-we0-f175.google.com with SMTP id t59so543878wes.20 for ; Tue, 04 Jun 2013 11:53:12 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 20:52:08 +0200 Message-Id: <1370371954-8479-14-git-send-email-pbonzini@redhat.com> In-Reply-To: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> References: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 13/39] ide/piix: use instance_finalize instead of exit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Signed-off-by: Paolo Bonzini --- hw/ide/piix.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/ide/piix.c b/hw/ide/piix.c index bf2856f..a0550c6 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -201,8 +201,9 @@ PCIDevice *pci_piix3_xen_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) return dev; } -static void pci_piix_ide_exitfn(PCIDevice *dev) +static void pci_piix_ide_instance_finalize(Object *obj) { + PCIDevice *dev = PCI_DEVICE(obj); PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev); unsigned i; @@ -244,7 +245,6 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data) k->no_hotplug = 1; k->init = pci_piix_ide_initfn; - k->exit = pci_piix_ide_exitfn; k->vendor_id = PCI_VENDOR_ID_INTEL; k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1; k->class_id = PCI_CLASS_STORAGE_IDE; @@ -256,6 +256,7 @@ static const TypeInfo piix3_ide_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIIDEState), .class_init = piix3_ide_class_init, + .instance_finalize = pci_piix_ide_instance_finalize, }; static void piix3_ide_xen_class_init(ObjectClass *klass, void *data) @@ -276,6 +277,7 @@ static const TypeInfo piix3_ide_xen_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIIDEState), .class_init = piix3_ide_xen_class_init, + .instance_finalize = pci_piix_ide_instance_finalize, }; static void piix4_ide_class_init(ObjectClass *klass, void *data) @@ -285,7 +287,6 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data) k->no_hotplug = 1; k->init = pci_piix_ide_initfn; - k->exit = pci_piix_ide_exitfn; k->vendor_id = PCI_VENDOR_ID_INTEL; k->device_id = PCI_DEVICE_ID_INTEL_82371AB; k->class_id = PCI_CLASS_STORAGE_IDE; @@ -297,6 +298,7 @@ static const TypeInfo piix4_ide_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIIDEState), .class_init = piix4_ide_class_init, + .instance_finalize = pci_piix_ide_instance_finalize, }; static void piix_ide_register_types(void) -- 1.8.1.4