From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpoM-0006zD-MQ for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpoE-0006U7-7s for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:22 -0400 Received: from mail-ee0-x232.google.com ([2a00:1450:4013:c00::232]:37549) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpoE-0006U3-1S for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:14 -0400 Received: by mail-ee0-f50.google.com with SMTP id d51so2978140eek.9 for ; Tue, 03 Sep 2013 05:34:13 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Sep 2013 14:33:11 +0200 Message-Id: <1378211609-16121-21-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 20/38] 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index a893165..12c2349 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -278,9 +278,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) { - PCIPCNetState *d = PCI_PCNET(dev); + PCIPCNetState *d = PCI_PCNET(obj); memory_region_destroy(&d->state.mmio); memory_region_destroy(&d->io_bar); @@ -357,7 +357,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; @@ -374,6 +373,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.3.1