From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMQ-00084p-0G for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwMP-0007iG-0U for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:33 -0400 Received: from mail-wg0-x236.google.com ([2a00:1450:400c:c00::236]:57636) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMO-0007i1-Q5 for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:32 -0400 Received: by mail-wg0-f54.google.com with SMTP id j13so551254wgh.33 for ; Tue, 04 Jun 2013 11:53:32 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 20:52:18 +0200 Message-Id: <1370371954-8479-24-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 23/39] vmxnet3: split exit and instance_finalize 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/vmxnet3.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 9de2586..5b1b9e0 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -1979,7 +1979,6 @@ vmxnet3_init_msix(VMXNET3State *s) if (!vmxnet3_use_msix_vectors(s, VMXNET3_MAX_INTRS)) { VMW_WRPRN("Failed to use MSI-X vectors, error %d", res); msix_uninit(d, &s->msix_bar, &s->msix_bar); - msix_free(d); s->msix_used = false; } else { s->msix_used = true; @@ -2124,11 +2123,18 @@ static void vmxnet3_pci_uninit(PCIDevice *pci_dev) unregister_savevm(dev, "vmxnet3-msix", s); - vmxnet3_net_uninit(s); - vmxnet3_cleanup_msix(s); vmxnet3_cleanup_msi(s); +} + +static void vmxnet3_pci_instance_finalize(Object *obj) +{ + PCIDevice *pci_dev = PCI_DEVICE(obj); + VMXNET3State *s = VMXNET3(pci_dev); + + vmxnet3_net_uninit(s); + msix_free(pci_dev); memory_region_destroy(&s->bar0); memory_region_destroy(&s->bar1); @@ -2463,6 +2469,7 @@ static const TypeInfo vmxnet3_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(VMXNET3State), .class_init = vmxnet3_class_init, + .instance_finalize = vmxnet3_pci_instance_finalize, }; static void vmxnet3_register_types(void) -- 1.8.1.4