From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpnq-0006H0-B9 for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:33:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpnh-0006Im-N0 for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:33:50 -0400 Received: from mail-ee0-x22a.google.com ([2a00:1450:4013:c00::22a]:46157) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpnh-0006Hc-Gc for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:33:41 -0400 Received: by mail-ee0-f42.google.com with SMTP id b45so2968476eek.29 for ; Tue, 03 Sep 2013 05:33:40 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Sep 2013 14:32:53 +0200 Message-Id: <1378211609-16121-3-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 02/38] pci: split exit and finalize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com When converting devices to use out-of-BQL memory access, destruction needs to be done in two phases. First, the device is unrealized; at this point, pending memory accesses can still be completed, but no new accesses will be started. The second part is freeing the device, which happens only after the reference count drops to zero; this means that all memory accesses are complete. Reviewed-by: Anthony Liguori Signed-off-by: Paolo Bonzini --- hw/pci/pci.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 4c004f5..bd084c7 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -787,6 +787,16 @@ static void pci_config_free(PCIDevice *pci_dev) g_free(pci_dev->used); } +static void pci_device_instance_finalize(Object *obj) +{ + PCIDevice *pci_dev = PCI_DEVICE(obj); + + qemu_free_irqs(pci_dev->irq); + + address_space_destroy(&pci_dev->bus_master_as); + memory_region_destroy(&pci_dev->bus_master_enable_region); +} + /* -1 for devfn means auto assign */ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, const char *name, int devfn) @@ -875,12 +885,8 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, static void do_pci_unregister_device(PCIDevice *pci_dev) { - qemu_free_irqs(pci_dev->irq); pci_dev->bus->devices[pci_dev->devfn] = NULL; pci_config_free(pci_dev); - - address_space_destroy(&pci_dev->bus_master_as); - memory_region_destroy(&pci_dev->bus_master_enable_region); } static void pci_unregister_io_regions(PCIDevice *pci_dev) @@ -2252,6 +2258,7 @@ static const TypeInfo pci_device_type_info = { .abstract = true, .class_size = sizeof(PCIDeviceClass), .class_init = pci_device_class_init, + .instance_finalize = pci_device_instance_finalize, }; static void pci_register_types(void) -- 1.8.3.1