From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpo8-0006ZC-1W for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpnz-0006Op-KZ for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:07 -0400 Received: from mail-ea0-x22f.google.com ([2a00:1450:4013:c01::22f]:41715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpnz-0006Od-DE for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:33:59 -0400 Received: by mail-ea0-f175.google.com with SMTP id m14so2926827eaj.20 for ; Tue, 03 Sep 2013 05:33:58 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Sep 2013 14:33:03 +0200 Message-Id: <1378211609-16121-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> References: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 12/38] 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/ide/piix.c b/hw/ide/piix.c index e6e6c0b..ddd72c1 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -200,9 +200,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) { - PCIIDEState *d = PCI_IDE(dev); + PCIIDEState *d = PCI_IDE(obj); unsigned i; for (i = 0; i < 2; ++i) { @@ -243,7 +243,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; @@ -255,6 +254,7 @@ static const TypeInfo piix3_ide_info = { .name = "piix3-ide", .parent = TYPE_PCI_IDE, .class_init = piix3_ide_class_init, + .instance_finalize = pci_piix_ide_instance_finalize, }; static void piix3_ide_xen_class_init(ObjectClass *klass, void *data) @@ -275,6 +275,7 @@ static const TypeInfo piix3_ide_xen_info = { .name = "piix3-ide-xen", .parent = TYPE_PCI_IDE, .class_init = piix3_ide_xen_class_init, + .instance_finalize = pci_piix_ide_instance_finalize, }; static void piix4_ide_class_init(ObjectClass *klass, void *data) @@ -284,7 +285,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; @@ -296,6 +296,7 @@ static const TypeInfo piix4_ide_info = { .name = "piix4-ide", .parent = TYPE_PCI_IDE, .class_init = piix4_ide_class_init, + .instance_finalize = pci_piix_ide_instance_finalize, }; static void piix_ide_register_types(void) -- 1.8.3.1