aboutsummaryrefslogtreecommitdiff
path: root/block/vhdx.c
diff options
context:
space:
mode:
authorSteve Sistare <steven.sistare@oracle.com>2023-10-18 06:03:36 -0700
committerJuan Quintela <quintela@redhat.com>2023-10-20 08:51:41 +0200
commitc8a7fc5179c649eed1d4286776a23e8a1a183cdc (patch)
treec5fb90795cb604c07815f6c4321e33ab93706cd3 /block/vhdx.c
parent04131e00097c5b85f96af6a66b1c009446c90ec1 (diff)
downloadqemu-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 'block/vhdx.c')
-rw-r--r--block/vhdx.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/block/vhdx.c b/block/vhdx.c
index 73cb214..e37f8c0 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -985,8 +985,7 @@ static void vhdx_close(BlockDriverState *bs)
s->bat = NULL;
qemu_vfree(s->parent_entries);
s->parent_entries = NULL;
- migrate_del_blocker(s->migration_blocker);
- error_free(s->migration_blocker);
+ migrate_del_blocker(&s->migration_blocker);
qemu_vfree(s->log.hdr);
s->log.hdr = NULL;
vhdx_region_unregister_all(s);
@@ -1097,9 +1096,8 @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags,
error_setg(&s->migration_blocker, "The vhdx format used by node '%s' "
"does not support live migration",
bdrv_get_device_or_node_name(bs));
- ret = migrate_add_blocker(s->migration_blocker, errp);
+ ret = migrate_add_blocker(&s->migration_blocker, errp);
if (ret < 0) {
- error_free(s->migration_blocker);
goto fail;
}