[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/16] mirror: Do initial aio context move of tar
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v2 10/16] mirror: Do initial aio context move of target via BB interface |
Date: |
Wed, 19 Apr 2017 17:43:50 +0800 |
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 bonus, the aio context move is now conditional, which avoids some
unnecessary operations in bdrv_set_aio_context.
Signed-off-by: Fam Zheng <address@hidden>
---
block/mirror.c | 9 +++++++++
blockdev.c | 4 ----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index fe2fb7a..2a287b0 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -1117,6 +1117,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;
@@ -1200,6 +1201,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;
diff --git a/blockdev.c b/blockdev.c
index dfd1385..53f9874 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -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,
--
2.9.3
- [Qemu-devel] [PATCH v2 00/16] block: Protect AIO context change with perm API, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 01/16] block: Define BLK_PERM_AIO_CONTEXT_CHANGE, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 02/16] block-backend: Add blk_request_perm, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 03/16] blockjob: Add BLK_PERM_AIO_CONTEXT_CHANGE shared perm on bs, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 04/16] blockjob: Allow aio context change on intermediate nodes, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 05/16] block: Propagate BLK_PERM_AIO_CONTEXT_CHANGE down the graph, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 06/16] backup: Request BLK_PERM_AIO_CONTEXT_CHANGE on target, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 07/16] backup: Do initial aio context move of target via BB interface, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 09/16] commit: Allow aio context change on s->base, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 08/16] mirror: Request aio context change permission on target, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 10/16] mirror: Do initial aio context move of target via BB interface,
Fam Zheng <=
- [Qemu-devel] [PATCH v2 11/16] virtio-scsi: Request BLK_PERM_AIO_CONTEXT_CHANGE for dataplane, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 12/16] virtio-blk: Request BLK_PERM_AIO_CONTEXT_CHANGE for dataplane, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 13/16] blk: fix aio context loss on media change, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 14/16] nbd: Allow BLK_PERM_AIO_CONTEXT_CHANGE on BB, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 15/16] block: Add perm assertion on blk_set_aio_context, Fam Zheng, 2017/04/19
- [Qemu-devel] [PATCH v2 16/16] tests: Add test case for BLK_PERM_AIO_CONTEXT_CHANGE, Fam Zheng, 2017/04/19