From patchwork Tue Jun 4 18:52:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 248824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1923B2C0082 for ; Wed, 5 Jun 2013 04:59:21 +1000 (EST) Received: from localhost ([::1]:57998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwRz-0008LN-6l for incoming@patchwork.ozlabs.org; Tue, 04 Jun 2013 14:59:19 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=O3yzIiV3M37P5uT4aWor9SS6SG7lpaNsrKUuzH/CX2o=; b=oykeCOoiVUFZEzJRzFpL8a7akUF8iDiY6o4bmJk31LragApeZKx2I/xCl9kko8s8UR UpQ41AuIgMKH7VxNZdhKPiTZXiXBB83PdDVylkFXWcVQZCtAj8h1Ks4gbeULOLfGLScU v9mShO0Z7A1+ao6h3fOV3G7/CPI482jIcyGkYIlsVQqQ5MvaWnqcijhkQZ1A98WbdY0x 5qySWLF1lu+1fkwt5ozWnGw9hrD3njbGxNVSNH6ciA2K3gxo44sPgrn2GHo8B5xPeCS/ jkHnsDfKCI2eMAIT4xASRCz/JiqPQ1OQXGPGpsvRK2FVdJ5b9Bw542orjtck1Vk1M1y+ 57eQ== X-Received: by 10.181.13.42 with SMTP id ev10mr2952244wid.1.1370372002426; Tue, 04 Jun 2013 11:53:22 -0700 (PDT) Received: from playground.lan (net-37-116-217-184.cust.dsl.vodafone.it. [37.116.217.184]) by mx.google.com with ESMTPSA id fx7sm4590484wic.11.2013.06.04.11.53.20 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Jun 2013 11:53:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2013 20:52:13 +0200 Message-Id: <1370371954-8479-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> References: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::22b Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 18/39] e1000: use instance_finalize instead of exit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)