From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpoE-0006le-Vl for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpo5-0006QZ-7s for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:14 -0400 Received: from mail-ea0-x22d.google.com ([2a00:1450:4013:c01::22d]:43631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpo5-0006QK-0h for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:05 -0400 Received: by mail-ea0-f173.google.com with SMTP id g10so2960617eak.18 for ; Tue, 03 Sep 2013 05:34:04 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Sep 2013 14:33:06 +0200 Message-Id: <1378211609-16121-16-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 15/38] pci-testdev: 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/misc/pci-testdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c index ca53b3f..10bf145 100644 --- a/hw/misc/pci-testdev.c +++ b/hw/misc/pci-testdev.c @@ -280,9 +280,9 @@ static int pci_testdev_init(PCIDevice *pci_dev) } static void -pci_testdev_uninit(PCIDevice *dev) +pci_testdev_instance_finalize(Object *obj) { - PCITestDevState *d = PCI_TEST_DEV(dev); + PCITestDevState *d = PCI_TEST_DEV(obj); int i; pci_testdev_reset(d); @@ -309,7 +309,6 @@ static void pci_testdev_class_init(ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = pci_testdev_init; - k->exit = pci_testdev_uninit; k->vendor_id = PCI_VENDOR_ID_REDHAT; k->device_id = PCI_DEVICE_ID_REDHAT_TEST; k->revision = 0x00; @@ -324,6 +323,7 @@ static const TypeInfo pci_testdev_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCITestDevState), .class_init = pci_testdev_class_init, + .instance_finalize = pci_testdev_instance_finalize, }; static void pci_testdev_register_types(void) -- 1.8.3.1