@@ -1116,6 +1116,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,
bool is_none_mode, BlockDriverState *base,
bool auto_complete, const char *filter_node_name)
{
+ AioContext *aio_context, *target_context;
MirrorBlockJob *s;
BlockDriverState *mirror_top_bs;
bool target_graph_mod;
@@ -1196,6 +1197,14 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,
goto fail;
}
+ aio_context = bdrv_get_aio_context(bs);
+ target_context = bdrv_get_aio_context(target);
+ if (target_context != aio_context) {
+ aio_context_acquire(target_context);
+ blk_set_aio_context(s->target, aio_context);
+ aio_context_release(target_context);
+ }
+
s->replaces = g_strdup(replaces);
s->on_source_error = on_source_error;
s->on_target_error = on_target_error;
@@ -3556,8 +3556,6 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
goto out;
}
- bdrv_set_aio_context(target_bs, aio_context);
-
blockdev_mirror_common(arg->has_job_id ? arg->job_id : NULL, bs, target_bs,
arg->has_replaces, arg->replaces, arg->sync,
backing_mode, arg->has_speed, arg->speed,
@@ -3608,8 +3606,6 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id,
aio_context = bdrv_get_aio_context(bs);
aio_context_acquire(aio_context);
- bdrv_set_aio_context(target_bs, aio_context);
-
blockdev_mirror_common(has_job_id ? job_id : NULL, bs, target_bs,
has_replaces, replaces, sync, backing_mode,
has_speed, speed,
While blockdev-backup tried to verify before moving target's aio context, the same is missing for blockdev-mirror. Now that we have the right interface, fix this as well. As a bounus, the aio context move is now conditional, which avoids unnecessary operations in bdrv_set_aio_context. Signed-off-by: Fam Zheng <famz@redhat.com> --- block/mirror.c | 9 +++++++++ blockdev.c | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-)