[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 40/55] Revert "mirror: Workaround for unexpected i
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 40/55] Revert "mirror: Workaround for unexpected iohandler events during completion" |
Date: |
Tue, 19 Jul 2016 20:54:29 +0300 |
From: Fam Zheng <address@hidden>
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>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
---
block/mirror.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index b1e633e..9ae11e5 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);
}
--
MST
- [Qemu-devel] [PULL v2 30/55] kvm-irqchip: i386: add hook for add/remove virq, (continued)
- [Qemu-devel] [PULL v2 30/55] kvm-irqchip: i386: add hook for add/remove virq, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 31/55] kvm-irqchip: x86: add msi route notify fn, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 32/55] kvm-irqchip: do explicit commit when update irq, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 33/55] intel_iommu: support all masks in interrupt entry cache invalidation, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 34/55] kvm-all: add trace events for kvm irqchip ops, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 35/55] intel_iommu: disallow kernel-irqchip=on with IR, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 36/55] virtio: Add typedef for handle_output, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 37/55] virtio: Introduce virtio_add_queue_aio, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 38/55] virtio-blk: Call virtio_add_queue_aio, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 39/55] virtio-scsi: Call virtio_add_queue_aio, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 40/55] Revert "mirror: Workaround for unexpected iohandler events during completion",
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 41/55] virtio-scsi: Replace HandleOutput typedef, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 42/55] virtio-net: Remove old migration version support, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 43/55] virtio-serial: Remove old migration version support, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 44/55] virtio: Migration helper function and macro, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 45/55] virtio-scsi: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 47/55] virtio-rng: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 46/55] virtio-blk: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 48/55] virtio-balloon: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 49/55] virtio-net: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19
- [Qemu-devel] [PULL v2 50/55] virtio-serial: Wrap in vmstate, Michael S. Tsirkin, 2016/07/19