diff options
| author | John Levon <john.levon@nutanix.com> | 2025-05-07 16:20:07 +0100 |
|---|---|---|
| committer | Cédric Le Goater <clg@redhat.com> | 2025-05-09 12:42:28 +0200 |
| commit | d60fb709cf948b3dc508eb88162f5666a49762ae (patch) | |
| tree | 33abc433764c6685d2164237140c1c01f5eb7e5d | |
| parent | a901682f53b51c07dc27aab7e30256855a2a1f2f (diff) | |
| download | qemu-d60fb709cf948b3dc508eb88162f5666a49762ae.zip qemu-d60fb709cf948b3dc508eb88162f5666a49762ae.tar.gz qemu-d60fb709cf948b3dc508eb88162f5666a49762ae.tar.bz2 | |
vfio: add vfio_device_unprepare()
Add a helper that's the inverse of vfio_device_prepare().
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-3-john.levon@nutanix.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
| -rw-r--r-- | hw/vfio/container.c | 6 | ||||
| -rw-r--r-- | hw/vfio/device.c | 7 | ||||
| -rw-r--r-- | hw/vfio/iommufd.c | 4 | ||||
| -rw-r--r-- | include/hw/vfio/vfio-device.h | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/hw/vfio/container.c b/hw/vfio/container.c index d30c1a1..cf23aa7 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -927,10 +927,10 @@ static void vfio_legacy_detach_device(VFIODevice *vbasedev) { VFIOGroup *group = vbasedev->group; - QLIST_REMOVE(vbasedev, global_next); - QLIST_REMOVE(vbasedev, container_next); - vbasedev->bcontainer = NULL; trace_vfio_device_detach(vbasedev->name, group->groupid); + + vfio_device_unprepare(vbasedev); + object_unref(vbasedev->hiod); vfio_device_put(vbasedev); vfio_group_put(group); diff --git a/hw/vfio/device.c b/hw/vfio/device.c index f3b9902..31c441a 100644 --- a/hw/vfio/device.c +++ b/hw/vfio/device.c @@ -412,3 +412,10 @@ void vfio_device_prepare(VFIODevice *vbasedev, VFIOContainerBase *bcontainer, QLIST_INSERT_HEAD(&vfio_device_list, vbasedev, global_next); } + +void vfio_device_unprepare(VFIODevice *vbasedev) +{ + QLIST_REMOVE(vbasedev, container_next); + QLIST_REMOVE(vbasedev, global_next); + vbasedev->bcontainer = NULL; +} diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index 83033c3..62ecb75 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -615,9 +615,7 @@ static void iommufd_cdev_detach(VFIODevice *vbasedev) VFIOIOMMUFDContainer *container = container_of(bcontainer, VFIOIOMMUFDContainer, bcontainer); - QLIST_REMOVE(vbasedev, global_next); - QLIST_REMOVE(vbasedev, container_next); - vbasedev->bcontainer = NULL; + vfio_device_unprepare(vbasedev); if (!vbasedev->ram_block_discard_allowed) { iommufd_cdev_ram_block_discard_disable(false); diff --git a/include/hw/vfio/vfio-device.h b/include/hw/vfio/vfio-device.h index 081929c..342c4ba 100644 --- a/include/hw/vfio/vfio-device.h +++ b/include/hw/vfio/vfio-device.h @@ -137,6 +137,8 @@ extern VFIODeviceList vfio_device_list; void vfio_device_prepare(VFIODevice *vbasedev, VFIOContainerBase *bcontainer, struct vfio_device_info *info); +void vfio_device_unprepare(VFIODevice *vbasedev); + 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, |