From d4a92a8420ac764f21652322aa7d4e49cfcbc607 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Wed, 13 Jul 2016 13:09:47 +0800 Subject: Revert "mirror: Workaround for unexpected iohandler events during completion" This reverts commit ab27c3b5e7408693dde0b565f050aa55c4a1bcef. The virtio storage device host notifiers now work with bdrv_drained_begin/end, so we don't need this hack any more. Signed-off-by: Fam Zheng Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Cornelia Huck Reviewed-by: Stefan Hajnoczi Acked-by: Paolo Bonzini --- block/mirror.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'block/mirror.c') diff --git a/block/mirror.c b/block/mirror.c index b1e633ecad..9ae11e5276 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -508,9 +508,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); } @@ -734,12 +731,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); } -- cgit v1.2.3