diff options
| author | Peter Maydell | 2016-05-26 20:18:08 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-05-26 20:18:08 +0200 |
| commit | 84cfc756d158a061bd462473d42b0a9f072218de (patch) | |
| tree | 90762acdf3e5f44ba48a88f178479af0a1de912b /include | |
| parent | Merge remote-tracking branch 'remotes/amit-migration/tags/migration-2.7-2' in... (diff) | |
| parent | vfio: Check that IOMMU MR translates to system address space (diff) | |
| download | qemu-84cfc756d158a061bd462473d42b0a9f072218de.tar.gz qemu-84cfc756d158a061bd462473d42b0a9f072218de.tar.xz qemu-84cfc756d158a061bd462473d42b0a9f072218de.zip | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20160526.1' into staging
VFIO updates 2016-05-26
- Infrastructure and quirks to support IGD assignment (Alex Williamson)
- Fixes to 128bit handling, IOMMU replay, IOMMU translation sanity
checking (Alexey Kardashevskiy)
# gpg: Signature made Thu 26 May 2016 18:50:29 BST using RSA key ID 3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg: aka "Alex Williamson <alex@shazbot.org>"
# gpg: aka "Alex Williamson <alwillia@redhat.com>"
# gpg: aka "Alex Williamson <alex.l.williamson@gmail.com>"
* remotes/awilliam/tags/vfio-update-20160526.1:
vfio: Check that IOMMU MR translates to system address space
memory: Fix IOMMU replay base address
vfio: Fix 128 bit handling when deleting region
vfio/pci: Add IGD documentation
vfio/pci: Add a separate option for IGD OpRegion support
vfio/pci: Intel graphics legacy mode assignment
vfio/pci: Setup BAR quirks after capabilities probing
vfio/pci: Consolidate VGA setup
vfio/pci: Fix return of vfio_populate_vga()
vfio: Create device specific region info helper
vfio: Enable sparse mmap capability
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/vfio/vfio-common.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index eb0e1b0342..0610377789 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -90,6 +90,7 @@ typedef struct VFIOContainer { typedef struct VFIOGuestIOMMU { VFIOContainer *container; MemoryRegion *iommu; + hwaddr iommu_offset; Notifier n; QLIST_ENTRY(VFIOGuestIOMMU) giommu_next; } VFIOGuestIOMMU; @@ -154,5 +155,7 @@ extern QLIST_HEAD(vfio_as_head, VFIOAddressSpace) vfio_address_spaces; #ifdef CONFIG_LINUX int vfio_get_region_info(VFIODevice *vbasedev, int index, struct vfio_region_info **info); +int vfio_get_dev_region_info(VFIODevice *vbasedev, uint32_t type, + uint32_t subtype, struct vfio_region_info **info); #endif #endif /* !HW_VFIO_VFIO_COMMON_H */ |