There could be more than one ops for IOMMU in the future. Renaming PCIIOMMUFunc to a more specific name better describes what it does, which is to do address space lookup.
Signed-off-by: Peter Xu <pet...@redhat.com> --- hw/pci/pci.c | 2 +- include/hw/pci/pci.h | 4 ++-- include/hw/pci/pci_bus.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index b282120..3f58bd4 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2413,7 +2413,7 @@ AddressSpace *pci_device_iommu_address_space(PCIDevice *dev) return &address_space_memory; } -void pci_setup_iommu(PCIBus *bus, PCIIOMMUFunc fn, void *opaque) +void pci_setup_iommu(PCIBus *bus, PCIIOMMUASLookupFunc fn, void *opaque) { bus->iommu_fn = fn; bus->iommu_opaque = opaque; diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index dedf277..846afee 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -418,10 +418,10 @@ void pci_bus_get_w64_range(PCIBus *bus, Range *range); void pci_device_deassert_intx(PCIDevice *dev); -typedef AddressSpace *(*PCIIOMMUFunc)(PCIBus *, void *, int); +typedef AddressSpace *(*PCIIOMMUASLookupFunc)(PCIBus *, void *, int); AddressSpace *pci_device_iommu_address_space(PCIDevice *dev); -void pci_setup_iommu(PCIBus *bus, PCIIOMMUFunc fn, void *opaque); +void pci_setup_iommu(PCIBus *bus, PCIIOMMUASLookupFunc fn, void *opaque); static inline void pci_set_byte(uint8_t *config, uint8_t val) diff --git a/include/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h index 403fec6..a8ab9c2 100644 --- a/include/hw/pci/pci_bus.h +++ b/include/hw/pci/pci_bus.h @@ -20,7 +20,7 @@ typedef struct PCIBusClass { struct PCIBus { BusState qbus; - PCIIOMMUFunc iommu_fn; + PCIIOMMUASLookupFunc iommu_fn; void *iommu_opaque; uint8_t devfn_min; pci_set_irq_fn set_irq; -- 2.4.3