From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V70xN-0006nR-OW for qemu-devel@nongnu.org; Wed, 07 Aug 2013 06:27:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V70xJ-0000ui-5s for qemu-devel@nongnu.org; Wed, 07 Aug 2013 06:27:05 -0400 Date: Wed, 7 Aug 2013 13:27:19 +0300 From: "Michael S. Tsirkin" Message-ID: <20130807102719.GB3068@redhat.com> References: <1375863692-12207-1-git-send-email-aik@ozlabs.ru> <1375863692-12207-2-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1375863692-12207-2-git-send-email-aik@ozlabs.ru> Subject: Re: [Qemu-devel] [PATCH 1/8] pci: Introduce helper to retrieve a PCI device's DMA address space List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy Cc: Anthony Liguori , Alexander Graf , qemu-devel@nongnu.org, Alex Williamson , qemu-ppc@nongnu.org, Paolo Bonzini , Paul Mackerras , David Gibson On Wed, Aug 07, 2013 at 06:21:25PM +1000, Alexey Kardashevskiy wrote: > From: David Gibson > > A PCI device's DMA address space (possibly an IOMMU) is returned by a > method on the PCIBus. At the moment that only has one caller, so the > method is simply open coded. We'll need another caller for VFIO, so > this patch introduces a helper/wrapper function. > > Signed-off-by: David Gibson > --- > hw/pci/pci.c | 9 ++++++++- > include/hw/pci/pci.h | 1 + > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 4bce3e7..3cea25f 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -813,7 +813,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, > > pci_dev->bus = bus; > if (bus->iommu_fn) { > - dma_as = bus->iommu_fn(bus, bus->iommu_opaque, devfn); > + dma_as = pci_iommu_as(pci_dev); > } else { > /* FIXME: inherit memory region from bus creator */ > dma_as = &address_space_memory; > @@ -2248,6 +2248,13 @@ static void pci_device_class_init(ObjectClass *klass, void *data) > k->props = pci_props; > } > > +AddressSpace *pci_iommu_as(PCIDevice *dev) > +{ > + PCIBus *bus = PCI_BUS(dev->bus); > + > + return bus->iommu_fn(bus, bus->iommu_opaque, dev->devfn); > +} > + > void pci_setup_iommu(PCIBus *bus, PCIIOMMUFunc fn, void *opaque) > { > bus->iommu_fn = fn; > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index b6ad9e4..614f809 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -407,6 +407,7 @@ void pci_device_deassert_intx(PCIDevice *dev); > > typedef AddressSpace *(*PCIIOMMUFunc)(PCIBus *, void *, int); > > +AddressSpace *pci_iommu_as(PCIDevice *dev); I prefer full names, and it needs to mention "device". How about: AddressSpace *pci_device_iommu_address_space(PCIDevice *dev); > void pci_setup_iommu(PCIBus *bus, PCIIOMMUFunc fn, void *opaque); > > static inline void > -- > 1.8.3.2