From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpog-0007c2-IM for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpoY-0006Za-5k for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:42 -0400 Received: from mail-ea0-x22c.google.com ([2a00:1450:4013:c01::22c]:37211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpoX-0006ZR-V0 for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:34 -0400 Received: by mail-ea0-f172.google.com with SMTP id r16so2962939ead.17 for ; Tue, 03 Sep 2013 05:34:33 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Sep 2013 14:33:22 +0200 Message-Id: <1378211609-16121-32-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 31/38] esp: 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/esp-pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index d7ec173..127868d 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -374,9 +374,9 @@ static int esp_pci_scsi_init(PCIDevice *dev) return 0; } -static void esp_pci_scsi_uninit(PCIDevice *d) +static void esp_pci_scsi_instance_finalize(Object *obj) { - PCIESPState *pci = PCI_ESP(d); + PCIESPState *pci = PCI_ESP(obj); memory_region_destroy(&pci->io); } @@ -387,7 +387,6 @@ static void esp_pci_class_init(ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = esp_pci_scsi_init; - k->exit = esp_pci_scsi_uninit; k->vendor_id = PCI_VENDOR_ID_AMD; k->device_id = PCI_DEVICE_ID_AMD_SCSI; k->revision = 0x10; @@ -403,6 +402,7 @@ static const TypeInfo esp_pci_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIESPState), .class_init = esp_pci_class_init, + .instance_finalize = esp_pci_scsi_instance_finalize, }; typedef struct { -- 1.8.3.1