[v4,5/6] Revert "mirror: Workaround for unexpected iohandler events during completion"

Commit Message

Fam Zheng July 13, 2016, 5:09 a.m. UTC

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 <[e-mail]>
---
 block/mirror.c | 9 ---------
 1 file changed, 9 deletions(-)

Comments

Cornelia Huck July 13, 2016, 9:10 a.m. UTC | #1

On Wed, 13 Jul 2016 13:09:47 +0800
Fam Zheng <[e-mail]> wrote:

> 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 <[e-mail]>
> ---
>  block/mirror.c | 9 ---------
>  1 file changed, 9 deletions(-)

Reviewed-by: Cornelia Huck <[e-mail]>

Patch

diff --git a/block/mirror.c b/block/mirror.c
index 8d96049..8a452a2 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -506,9 +506,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);
 }
 
@@ -732,12 +729,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);
 }