From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpoi-0007fP-ET for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpoZ-0006Zu-RP for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:44 -0400 Received: from mail-ea0-x230.google.com ([2a00:1450:4013:c01::230]:43891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpoZ-0006Zm-Ky for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:35 -0400 Received: by mail-ea0-f176.google.com with SMTP id q16so2952648ead.21 for ; Tue, 03 Sep 2013 05:34:34 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Sep 2013 14:33:23 +0200 Message-Id: <1378211609-16121-33-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 32/38] lsi: 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/scsi/lsi53c895a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 611f2aa..ee13308 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -2072,9 +2072,9 @@ static const VMStateDescription vmstate_lsi_scsi = { } }; -static void lsi_scsi_uninit(PCIDevice *d) +static void lsi_scsi_instance_finalize(Object *obj) { - LSIState *s = LSI53C895A(d); + LSIState *s = LSI53C895A(obj); memory_region_destroy(&s->mmio_io); memory_region_destroy(&s->ram_io); @@ -2134,7 +2134,6 @@ static void lsi_class_init(ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = lsi_scsi_init; - k->exit = lsi_scsi_uninit; k->vendor_id = PCI_VENDOR_ID_LSI_LOGIC; k->device_id = PCI_DEVICE_ID_LSI_53C895A; k->class_id = PCI_CLASS_STORAGE_SCSI; @@ -2149,6 +2148,7 @@ static const TypeInfo lsi_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(LSIState), .class_init = lsi_class_init, + .instance_finalize = lsi_scsi_instance_finalize, }; static void lsi53c895a_register_types(void) -- 1.8.3.1