From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpoK-0006uO-4n for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpoA-0006TF-Sh for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:19 -0400 Received: from mail-ee0-x22f.google.com ([2a00:1450:4013:c00::22f]:56707) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpoA-0006St-F3 for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:10 -0400 Received: by mail-ee0-f47.google.com with SMTP id d49so2983169eek.34 for ; Tue, 03 Sep 2013 05:34:09 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Sep 2013 14:33:09 +0200 Message-Id: <1378211609-16121-19-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 18/38] eepro100: 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/eepro100.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index ffa60d5..9d45aa4 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -1840,8 +1840,9 @@ static void nic_cleanup(NetClientState *nc) s->nic = NULL; } -static void pci_nic_uninit(PCIDevice *pci_dev) +static void pci_nic_instance_finalize(Object *obj) { + PCIDevice *pci_dev = PCI_DEVICE(obj); EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev); memory_region_destroy(&s->mmio_bar); @@ -2090,7 +2091,6 @@ static void eepro100_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_NETWORK_ETHERNET; k->romfile = "pxe-eepro100.rom"; k->init = e100_nic_init; - k->exit = pci_nic_uninit; k->device_id = info->device_id; k->revision = info->revision; k->subsystem_vendor_id = info->subsystem_vendor_id; @@ -2108,6 +2108,7 @@ static void eepro100_register_types(void) type_info.parent = TYPE_PCI_DEVICE; type_info.class_init = eepro100_class_init; type_info.instance_size = sizeof(EEPRO100State); + type_info.instance_finalize = pci_nic_instance_finalize; type_register(&type_info); } -- 1.8.3.1