From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwM4-0007PK-OU for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwM3-0007Zz-MG for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:12 -0400 Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]:36735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwM3-0007Zm-HP for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:11 -0400 Received: by mail-wi0-f170.google.com with SMTP id hr14so4193730wib.1 for ; Tue, 04 Jun 2013 11:53:10 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 20:52:07 +0200 Message-Id: <1370371954-8479-13-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 12/39] cmd646: 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/cmd646.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index a73eb9a..296dee6 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -295,8 +295,9 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev) return 0; } -static void pci_cmd646_ide_exitfn(PCIDevice *dev) +static void pci_cmd646_ide_instance_finalize(Object *obj) { + PCIDevice *dev = PCI_DEVICE(obj); PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev); unsigned i; @@ -334,7 +335,6 @@ static void cmd646_ide_class_init(ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = pci_cmd646_ide_initfn; - k->exit = pci_cmd646_ide_exitfn; k->vendor_id = PCI_VENDOR_ID_CMD; k->device_id = PCI_DEVICE_ID_CMD_646; k->revision = 0x07; @@ -347,6 +347,7 @@ static const TypeInfo cmd646_ide_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIIDEState), .class_init = cmd646_ide_class_init, + .instance_finalize = pci_cmd646_ide_instance_finalize, }; static void cmd646_ide_register_types(void) -- 1.8.1.4