vfio: add vfio_device_get_region_fd()
PATCH 1/1 vfio: add vfio_device_get_region_fd()
This keeps the existence of ->region_fds private to hw/vfio/device.c.
Signed-off-by John Levon <[email protected]>
--- include/hw/vfio/vfio-device.h | 12 ++++++++++++ hw/vfio/device.c | 7 +++++++ hw/vfio/region.c | 5 +---- 3 files changed, 20 insertions(+), 4 deletions(-)
include/hw/vfio/vfio-device.h +12 -0
@@ -256,6 +256,18 @@ int vfio_device_get_region_info(VFIODevice *vbasedev, int index, struct vfio_region_info **info);int vfio_device_get_region_info_type (VFIODevice *vbasedev,uint32_t type,uint32_t subtype,struct vfio_region_info **info); + +/** +* Return the fd for mapping this region. This is either the device's fd (for +* e.g. kernel vfio), or a per-region fd (for vfio-user). +* +* @vbasedev: #VFIODevice to use +* @index: region index +* +* Returns the fd. +*/ +int vfio_device_get_region_fd (VFIODevice *vbasedev,int index); +bool vfio_device_has_region_cap (VFIODevice *vbasedev,int region,uint16_t cap_type); int vfio_device_get_irq_info(VFIODevice *vbasedev, int index,
hw/vfio/device.c +7 -0
@@ -243,6 +243,13 @@ retry:return 0 ; } +int vfio_device_get_region_fd (VFIODevice *vbasedev,int index) +{ +return vbasedev->region_fds ? + vbasedev->region_fds[index] : + vbasedev->fd; +} +int vfio_device_get_region_info_type (VFIODevice *vbasedev,uint32_t type,uint32_t subtype,struct vfio_region_info **info) {
hw/vfio/region.c +1 -4
@@ -273,10 +273,7 @@ int vfio_region_mmap(VFIORegion *region) goto no_mmap; } -/* Use the per-region fd if set, or the shared fd. */ - fd = region->vbasedev->region_fds ? - region->vbasedev->region_fds[region->nr] : - region->vbasedev->fd, + fd =vfio_device_get_region_fd (region->vbasedev, region->nr); map_align = (void *)ROUND_UP ((uintptr_t )map_base, (uintptr_t )align);munmap (map_base, map_align - map_base);
Signature · 1 line
2.43.0
Quoted 8 lines · John Levon
This keeps the existence of ->region_fds private to
hw/vfio/device.c.Signed-off-by John Levon <[email protected]>--- include/hw/vfio/vfio-device.h | 12 ++++++++++++ hw/vfio/device.c | 7 +++++++ hw/vfio/region.c | 5 +---- 3 files changed, 20 insertions(+), 4 deletions(-)
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Quoted 3 lines · John Levon
This keeps the existence of ->region_fds private to
hw/vfio/device.c.Signed-off-by John Levon <[email protected]>
Reviewed-by Cédric Le Goater <[email protected]>
Applied to vfio-next.
Thanks,
C.