From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpoH-0006ot-7E for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpo8-0006Sh-Pp for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:17 -0400 Received: from mail-ee0-x232.google.com ([2a00:1450:4013:c00::232]:61919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpo8-0006Rd-Io for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:08 -0400 Received: by mail-ee0-f50.google.com with SMTP id d51so2969626eek.37 for ; Tue, 03 Sep 2013 05:34:07 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Sep 2013 14:33:08 +0200 Message-Id: <1378211609-16121-18-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 17/38] 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index f5ebed4..55fb062 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1310,9 +1310,9 @@ e1000_cleanup(NetClientState *nc) } static void -pci_e1000_uninit(PCIDevice *dev) +pci_e1000_instance_finalize(Object *obj) { - E1000State *d = E1000(dev); + E1000State *d = E1000(obj); timer_del(d->autoneg_timer); timer_free(d->autoneg_timer); @@ -1394,7 +1394,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; @@ -1412,6 +1411,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.3.1