@@ -161,22 +161,7 @@ void vfio_unblock_multiple_devices_migration(void)
bool vfio_viommu_preset(VFIODevice *vbasedev)
{
- VFIOAddressSpace *space;
- VFIOContainer *container;
- VFIODevice *tmp_vbasedev;
-
- QLIST_FOREACH(space, &vfio_address_spaces, list) {
- QLIST_FOREACH(container, &space->containers, next) {
- tmp_vbasedev = NULL;
- while ((vbasedev = vfio_container_dev_iter_next(container,
- vbasedev))) {
- if (vbasedev == tmp_vbasedev) {
- return space->as != &address_space_memory;
- }
- }
- }
- }
- g_assert_not_reached();
+ return vbasedev->container->space->as != &address_space_memory;
}
static void vfio_set_migration_error(int err)
Commit "vfio/container-base: Introduce [attach/detach]_device container callbacks" add support to link to address space, we can utilize it to simplify vfio_viommu_preset(). Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com> --- hw/vfio/as.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)