From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMi-0000CX-TL for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwMi-0007rG-2t for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:52 -0400 Received: from mail-we0-x233.google.com ([2a00:1450:400c:c03::233]:60376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMh-0007r6-Se for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:51 -0400 Received: by mail-we0-f179.google.com with SMTP id w59so558637wes.10 for ; Tue, 04 Jun 2013 11:53:51 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 20:52:28 +0200 Message-Id: <1370371954-8479-34-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 33/39] 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 22b8e98..53bbc01 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -2059,8 +2059,9 @@ static const VMStateDescription vmstate_lsi_scsi = { } }; -static void lsi_scsi_uninit(PCIDevice *d) +static void lsi_scsi_instance_finalize(Object *obj) { + PCIDevice *d = PCI_DEVICE(obj); LSIState *s = DO_UPCAST(LSIState, dev, d); memory_region_destroy(&s->mmio_io); @@ -2112,7 +2113,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; @@ -2126,6 +2126,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.1.4