From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMM-0007w2-0p for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwML-0007hS-39 for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:29 -0400 Received: from mail-we0-x235.google.com ([2a00:1450:400c:c03::235]:45989) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMK-0007hN-T5 for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:29 -0400 Received: by mail-we0-f181.google.com with SMTP id p58so565521wes.12 for ; Tue, 04 Jun 2013 11:53:28 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 20:52:16 +0200 Message-Id: <1370371954-8479-22-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 21/39] pcnet: 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/net/pcnet-pci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index 9df2b87..2cd2927 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -271,8 +271,9 @@ static void pci_pcnet_cleanup(NetClientState *nc) pcnet_common_cleanup(d); } -static void pci_pcnet_uninit(PCIDevice *dev) +static void pci_pcnet_instance_finalize(Object *obj) { + PCIDevice *dev = PCI_DEVICE(obj); PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, dev); memory_region_destroy(&d->state.mmio); @@ -350,7 +351,6 @@ static void pcnet_class_init(ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = pci_pcnet_init; - k->exit = pci_pcnet_uninit; k->romfile = "efi-pcnet.rom", k->vendor_id = PCI_VENDOR_ID_AMD; k->device_id = PCI_DEVICE_ID_AMD_LANCE; @@ -366,6 +366,7 @@ static const TypeInfo pcnet_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIPCNetState), .class_init = pcnet_class_init, + .instance_finalize = pci_pcnet_instance_finalize, }; static void pci_pcnet_register_types(void) -- 1.8.1.4