From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLs9A-0003CC-MW for qemu-devel@nongnu.org; Tue, 17 Sep 2013 06:04:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VLs91-0002au-Kc for qemu-devel@nongnu.org; Tue, 17 Sep 2013 06:04:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62157) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLs91-0002ah-Bg for qemu-devel@nongnu.org; Tue, 17 Sep 2013 06:04:31 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8HA4Ufh027118 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Sep 2013 06:04:30 -0400 Date: Tue, 17 Sep 2013 13:06:43 +0300 From: "Michael S. Tsirkin" Message-ID: <20130917100643.GB18677@redhat.com> References: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> <1378211609-16121-3-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1378211609-16121-3-git-send-email-pbonzini@redhat.com> Subject: Re: [Qemu-devel] [PATCH 02/38] pci: split exit and finalize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org On Tue, Sep 03, 2013 at 02:32:53PM +0200, Paolo Bonzini wrote: > 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) Actually this isn't enough, memory_region_destroy is called from pci_del_option_rom too. > @@ -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 >