diff options
| author | John Levon <john.levon@nutanix.com> | 2025-05-07 16:20:08 +0100 |
|---|---|---|
| committer | Cédric Le Goater <clg@redhat.com> | 2025-05-09 12:42:28 +0200 |
| commit | ef73671f0bfc7bd852439e42ab4260104d902055 (patch) | |
| tree | 6378e9ca52059431502a449d899ac3e2d54c3e40 | |
| parent | d60fb709cf948b3dc508eb88162f5666a49762ae (diff) | |
| download | qemu-ef73671f0bfc7bd852439e42ab4260104d902055.zip qemu-ef73671f0bfc7bd852439e42ab4260104d902055.tar.gz qemu-ef73671f0bfc7bd852439e42ab4260104d902055.tar.bz2 | |
vfio: add vfio_attach_device_by_iommu_type()
Allow attachment by explicitly passing a TYPE_VFIO_IOMMU_* string;
vfio-user will use this later.
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: John Levon <john.levon@nutanix.com>
Link: https://lore.kernel.org/qemu-devel/20250507152020.1254632-4-john.levon@nutanix.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
| -rw-r--r-- | hw/vfio/device.c | 22 | ||||
| -rw-r--r-- | include/hw/vfio/vfio-device.h | 3 |
2 files changed, 18 insertions, 7 deletions
diff --git a/hw/vfio/device.c b/hw/vfio/device.c index 31c441a..9673b07 100644 --- a/hw/vfio/device.c +++ b/hw/vfio/device.c @@ -376,21 +376,29 @@ VFIODevice *vfio_get_vfio_device(Object *obj) } } -bool vfio_device_attach(char *name, VFIODevice *vbasedev, - AddressSpace *as, Error **errp) +bool vfio_device_attach_by_iommu_type(const char *iommu_type, char *name, + VFIODevice *vbasedev, AddressSpace *as, + Error **errp) { const VFIOIOMMUClass *ops = - VFIO_IOMMU_CLASS(object_class_by_name(TYPE_VFIO_IOMMU_LEGACY)); - - if (vbasedev->iommufd) { - ops = VFIO_IOMMU_CLASS(object_class_by_name(TYPE_VFIO_IOMMU_IOMMUFD)); - } + VFIO_IOMMU_CLASS(object_class_by_name(iommu_type)); assert(ops); return ops->attach_device(name, vbasedev, as, errp); } +bool vfio_device_attach(char *name, VFIODevice *vbasedev, + AddressSpace *as, Error **errp) +{ + const char *iommu_type = vbasedev->iommufd ? + TYPE_VFIO_IOMMU_IOMMUFD : + TYPE_VFIO_IOMMU_LEGACY; + + return vfio_device_attach_by_iommu_type(iommu_type, name, vbasedev, + as, errp); +} + void vfio_device_detach(VFIODevice *vbasedev) { if (!vbasedev->bcontainer) { diff --git a/include/hw/vfio/vfio-device.h b/include/hw/vfio/vfio-device.h index 342c4ba..8b1437b 100644 --- a/include/hw/vfio/vfio-device.h +++ b/include/hw/vfio/vfio-device.h @@ -127,6 +127,9 @@ bool vfio_device_hiod_create_and_realize(VFIODevice *vbasedev, const char *typename, Error **errp); bool vfio_device_attach(char *name, VFIODevice *vbasedev, AddressSpace *as, Error **errp); +bool vfio_device_attach_by_iommu_type(const char *iommu_type, char *name, + VFIODevice *vbasedev, AddressSpace *as, + Error **errp); void vfio_device_detach(VFIODevice *vbasedev); VFIODevice *vfio_get_vfio_device(Object *obj); |