On Fri, 05/29 10:22, Fam Zheng wrote:
> mirror_exit does the replacing, which requires source and target to be
> in sync, unfortunately we can't guarantee that before we have a complete
> block pause mechanism. So for non-dataplane block jobs, let's do the old
> thing as pre commit 5a7e7a0ba (block: let mirror blockjob run in BDS
> AioContext) - directly call mirror_exit().
>
> Dataplane case is taken care of in separate patches.
This one is superceded by
[PATCH v2 07/13] mirror: Protect source between bdrv_drain and bdrv_swap
Fam
>
> Suggested-by: Paolo Bonzini <pbonz...@redhat.com>
> Signed-off-by: Fam Zheng <f...@redhat.com>
> ---
> block/mirror.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/block/mirror.c b/block/mirror.c
> index 58f391a..112393a 100644
> --- a/block/mirror.c
> +++ b/block/mirror.c
> @@ -565,7 +565,11 @@ immediate_exit:
>
> data = g_malloc(sizeof(*data));
> data->ret = ret;
> - block_job_defer_to_main_loop(&s->common, mirror_exit, data);
> + if (bs->aio_context == qemu_get_aio_context()) {
> + mirror_exit(&s->common, data);
> + } else {
> + block_job_defer_to_main_loop(&s->common, mirror_exit, data);
> + }
> }
>
> static void mirror_set_speed(BlockJob *job, int64_t speed, Error **errp)
> --
> 2.4.2
>
>
