[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 7/7] Revert "mirror: Workaround for unexpected io
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v2 7/7] Revert "mirror: Workaround for unexpected iohandler events during completion" |
Date: |
Fri, 24 Jun 2016 20:39:34 +0800 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 4/7] virtio: Use aio_set_event_notifier for aio vq, (continued)
- [Qemu-devel] [PATCH v2 4/7] virtio: Use aio_set_event_notifier for aio vq, Fam Zheng, 2016/06/24
- [Qemu-devel] [PATCH v2 2/7] virtio: Add typedef for handle_output, Fam Zheng, 2016/06/24
- [Qemu-devel] [PATCH v2 3/7] virtio: Introduce virtio_add_queue_aio, Fam Zheng, 2016/06/24
- [Qemu-devel] [PATCH v2 6/7] virtio-scsi: Call virtio_add_queue_aio, Fam Zheng, 2016/06/24
- [Qemu-devel] [PATCH v2 5/7] virtio-blk: Call virtio_add_queue_aio, Fam Zheng, 2016/06/24
- [Qemu-devel] [PATCH v2 7/7] Revert "mirror: Workaround for unexpected iohandler events during completion",
Fam Zheng <=
- Re: [Qemu-devel] [PATCH v2 0/7] virtio: Merge virtio-{blk, scsi} host notifier handling paths, Stefan Hajnoczi, 2016/06/28