From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpo6-0006WN-Gd for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpnx-0006OS-Qi for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:06 -0400 Received: from mail-ea0-x22a.google.com ([2a00:1450:4013:c01::22a]:45705) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpnx-0006OL-Jy for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:33:57 -0400 Received: by mail-ea0-f170.google.com with SMTP id h14so2961329eak.15 for ; Tue, 03 Sep 2013 05:33:56 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Sep 2013 14:33:02 +0200 Message-Id: <1378211609-16121-12-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 11/38] 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index d6ef799..161b118 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -303,9 +303,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) { - PCIIDEState *d = PCI_IDE(dev); + PCIIDEState *d = PCI_IDE(obj); unsigned i; for (i = 0; i < 2; ++i) { @@ -342,7 +342,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; @@ -354,6 +353,7 @@ static const TypeInfo cmd646_ide_info = { .name = "cmd646-ide", .parent = TYPE_PCI_IDE, .class_init = cmd646_ide_class_init, + .instance_finalize = pci_cmd646_ide_instance_finalize, }; static void cmd646_ide_register_types(void) -- 1.8.3.1