diff options
| author | Steve Sistare <steven.sistare@oracle.com> | 2023-10-18 06:03:36 -0700 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-10-20 08:51:41 +0200 |
| commit | c8a7fc5179c649eed1d4286776a23e8a1a183cdc (patch) | |
| tree | c5fb90795cb604c07815f6c4321e33ab93706cd3 /hw/vfio/common.c | |
| parent | 04131e00097c5b85f96af6a66b1c009446c90ec1 (diff) | |
| download | qemu-c8a7fc5179c649eed1d4286776a23e8a1a183cdc.zip qemu-c8a7fc5179c649eed1d4286776a23e8a1a183cdc.tar.gz qemu-c8a7fc5179c649eed1d4286776a23e8a1a183cdc.tar.bz2 | |
migration: simplify blockers
Modify migrate_add_blocker and migrate_del_blocker to take an Error **
reason. This allows migration to own the Error object, so that if
an error occurs in migrate_add_blocker, migration code can free the Error
and clear the client handle, simplifying client code. It also simplifies
the migrate_del_blocker call site.
In addition, this is a pre-requisite for a proposed future patch that would
add a mode argument to migration requests to support live update, and
maintain a list of blockers for each mode. A blocker may apply to a single
mode or to multiple modes, and passing Error** will allow one Error object
to be registered for multiple modes.
No functional change.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Tested-by: Michael Galaxy <mgalaxy@akamai.com>
Reviewed-by: Michael Galaxy <mgalaxy@akamai.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <1697634216-84215-1-git-send-email-steven.sistare@oracle.com>
Diffstat (limited to 'hw/vfio/common.c')
| -rw-r--r-- | hw/vfio/common.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 5ff5acf..d806057 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -129,11 +129,7 @@ int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp) error_setg(&multiple_devices_migration_blocker, "Multiple VFIO devices migration is supported only if all of " "them support P2P migration"); - ret = migrate_add_blocker(multiple_devices_migration_blocker, errp); - if (ret < 0) { - error_free(multiple_devices_migration_blocker); - multiple_devices_migration_blocker = NULL; - } + ret = migrate_add_blocker(&multiple_devices_migration_blocker, errp); return ret; } @@ -145,9 +141,7 @@ void vfio_unblock_multiple_devices_migration(void) return; } - migrate_del_blocker(multiple_devices_migration_blocker); - error_free(multiple_devices_migration_blocker); - multiple_devices_migration_blocker = NULL; + migrate_del_blocker(&multiple_devices_migration_blocker); } bool vfio_viommu_preset(VFIODevice *vbasedev) |