From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMN-00080y-Vg for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwMM-0007hn-Vt for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:31 -0400 Received: from mail-we0-x230.google.com ([2a00:1450:400c:c03::230]:34757) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMM-0007he-Pq for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:30 -0400 Received: by mail-we0-f176.google.com with SMTP id t56so537509wes.21 for ; Tue, 04 Jun 2013 11:53:30 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 20:52:17 +0200 Message-Id: <1370371954-8479-23-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 22/39] rtl8139: 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/rtl8139.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 7993f9f..c1c4921 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -3437,8 +3437,9 @@ static void rtl8139_cleanup(NetClientState *nc) s->nic = NULL; } -static void pci_rtl8139_uninit(PCIDevice *dev) +static void pci_rtl8139_instance_finalize(Object *obj) { + PCIDevice *dev = PCI_DEVICE(obj); RTL8139State *s = DO_UPCAST(RTL8139State, dev, dev); memory_region_destroy(&s->bar_io); @@ -3532,7 +3533,6 @@ static void rtl8139_class_init(ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = pci_rtl8139_init; - k->exit = pci_rtl8139_uninit; k->romfile = "efi-rtl8139.rom"; k->vendor_id = PCI_VENDOR_ID_REALTEK; k->device_id = PCI_DEVICE_ID_REALTEK_8139; @@ -3548,6 +3548,7 @@ static const TypeInfo rtl8139_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(RTL8139State), .class_init = rtl8139_class_init, + .instance_finalize = pci_rtl8139_instance_finalize, }; static void rtl8139_register_types(void) -- 1.8.1.4