[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/14] block: Call .drain_begin only once in bdrv_dra
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 05/14] block: Call .drain_begin only once in bdrv_drain_all_begin() |
Date: |
Wed, 20 Dec 2017 14:19:30 +0100 |
bdrv_drain_all_begin() used to call the .bdrv_co_drain_begin() driver
callback inside its polling loop. This means that how many times it got
called for each node depended on long it had to poll the event loop.
This is obviously not right and results in nodes that stay drained even
after bdrv_drain_all_end(), which calls .bdrv_co_drain_begin() once per
node.
Fix bdrv_drain_all_begin() to call the callback only once, too.
Cc: address@hidden
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
block/io.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/block/io.c b/block/io.c
index 096468b761..603f5b059e 100644
--- a/block/io.c
+++ b/block/io.c
@@ -355,6 +355,7 @@ void bdrv_drain_all_begin(void)
aio_context_acquire(aio_context);
bdrv_parent_drained_begin(bs);
aio_disable_external(aio_context);
+ bdrv_drain_invoke(bs, true);
aio_context_release(aio_context);
if (!g_slist_find(aio_ctxs, aio_context)) {
@@ -377,8 +378,6 @@ void bdrv_drain_all_begin(void)
aio_context_acquire(aio_context);
for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
if (aio_context == bdrv_get_aio_context(bs)) {
- /* FIXME Calling this multiple times is wrong */
- bdrv_drain_invoke(bs, true);
waited |= bdrv_drain_recurse(bs, true);
}
}
--
2.13.6
- [Qemu-devel] [PULL 00/14] Block layer patches, Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 01/14] hw/block/nvme: Convert to realize, Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 02/14] block: Formats don't need CONSISTENT_READ with NO_IO, Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 03/14] iotests: fix 197 for vpc, Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 04/14] block: Make bdrv_drain_invoke() recursive, Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 05/14] block: Call .drain_begin only once in bdrv_drain_all_begin(),
Kevin Wolf <=
- [Qemu-devel] [PULL 06/14] test-bdrv-drain: Test BlockDriver callbacks for drain, Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 07/14] block: bdrv_drain_recurse(): Remove unused begin parameter, Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 08/14] block: Don't wait for requests in bdrv_drain*_end(), Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 09/14] block: Unify order in drain functions, Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 12/14] qcow2: get rid of qcow2_backing_read1 routine, Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 11/14] block: Don't acquire AioContext in hmp_qemu_io(), Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 10/14] qemu-img: Document --force-share / -U, Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 13/14] block: Document that x-blockdev-change breaks quorum children list, Kevin Wolf, 2017/12/20
- [Qemu-devel] [PULL 14/14] nvme: Add tracing, Kevin Wolf, 2017/12/20
- Re: [Qemu-devel] [PULL 00/14] Block layer patches, Peter Maydell, 2017/12/20