From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMG-0007nH-Kd for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwMF-0007gA-Dx for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:24 -0400 Received: from mail-we0-x22b.google.com ([2a00:1450:400c:c03::22b]:32915) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMF-0007fr-8I for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:23 -0400 Received: by mail-we0-f171.google.com with SMTP id m46so554208wev.16 for ; Tue, 04 Jun 2013 11:53:22 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 20:52:13 +0200 Message-Id: <1370371954-8479-19-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 18/39] e1000: 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/e1000.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index e6f46f0..cad4fd6 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1294,8 +1294,9 @@ e1000_cleanup(NetClientState *nc) } static void -pci_e1000_uninit(PCIDevice *dev) +pci_e1000_instance_finalize(Object *obj) { + PCIDevice *dev = PCI_DEVICE(obj); E1000State *d = DO_UPCAST(E1000State, dev, dev); qemu_del_timer(d->autoneg_timer); @@ -1377,7 +1378,6 @@ static void e1000_class_init(ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = pci_e1000_init; - k->exit = pci_e1000_uninit; k->romfile = "efi-e1000.rom"; k->vendor_id = PCI_VENDOR_ID_INTEL; k->device_id = E1000_DEVID; @@ -1394,6 +1394,7 @@ static const TypeInfo e1000_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(E1000State), .class_init = e1000_class_init, + .instance_finalize = pci_e1000_instance_finalize, }; static void e1000_register_types(void) -- 1.8.1.4