This reverts commit ab27c3b5e7408693dde0b565f050aa55c4a1bcef. The virtio host notifiers are now covered by bdrv_drained_begin/end, so we don't need this hacky quiescing of the iohandler context anymore.
Signed-off-by: Fam Zheng <f...@redhat.com> --- block/mirror.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index a04ed9c..147c0d6 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -500,9 +500,6 @@ static void mirror_exit(BlockJob *job, void *opaque) block_job_completed(&s->common, data->ret); g_free(data); bdrv_drained_end(src); - if (qemu_get_aio_context() == bdrv_get_aio_context(src)) { - aio_enable_external(iohandler_get_aio_context()); - } bdrv_unref(src); } @@ -726,12 +723,6 @@ immediate_exit: /* Before we switch to target in mirror_exit, make sure data doesn't * change. */ bdrv_drained_begin(bs); - if (qemu_get_aio_context() == bdrv_get_aio_context(bs)) { - /* FIXME: virtio host notifiers run on iohandler_ctx, therefore the - * above bdrv_drained_end isn't enough to quiesce it. This is ugly, we - * need a block layer API change to achieve this. */ - aio_disable_external(iohandler_get_aio_context()); - } block_job_defer_to_main_loop(&s->common, mirror_exit, data); } -- 2.8.3