[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 24/35] block: Don't block_job_pause_all() in bdrv_
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL v3 24/35] block: Don't block_job_pause_all() in bdrv_drain_all() |
Date: |
Fri, 22 Dec 2017 16:18:35 +0100 |
Block jobs are already paused using the BdrvChildRole drain callbacks,
so we don't need an additional block_job_pause_all() call.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/io.c | 4 ----
tests/test-bdrv-drain.c | 10 ++++------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/block/io.c b/block/io.c
index 91a52e2d82..74d2e5278e 100644
--- a/block/io.c
+++ b/block/io.c
@@ -338,8 +338,6 @@ void bdrv_drain_all_begin(void)
* context. */
assert(qemu_get_current_aio_context() == qemu_get_aio_context());
- block_job_pause_all();
-
for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
AioContext *aio_context = bdrv_get_aio_context(bs);
@@ -395,8 +393,6 @@ void bdrv_drain_all_end(void)
aio_enable_external(aio_context);
aio_context_release(aio_context);
}
-
- block_job_resume_all();
}
void bdrv_drain_all(void)
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
index 9783768a20..6da66ae841 100644
--- a/tests/test-bdrv-drain.c
+++ b/tests/test-bdrv-drain.c
@@ -284,9 +284,8 @@ static void test_blockjob_common(enum drain_type drain_type)
do_drain_begin(drain_type, src);
if (drain_type == BDRV_DRAIN_ALL) {
- /* bdrv_drain_all() drains both src and target, and involves an
- * additional block_job_pause_all() */
- g_assert_cmpint(job->pause_count, ==, 3);
+ /* bdrv_drain_all() drains both src and target */
+ g_assert_cmpint(job->pause_count, ==, 2);
} else {
g_assert_cmpint(job->pause_count, ==, 1);
}
@@ -303,9 +302,8 @@ static void test_blockjob_common(enum drain_type drain_type)
do_drain_begin(drain_type, target);
if (drain_type == BDRV_DRAIN_ALL) {
- /* bdrv_drain_all() drains both src and target, and involves an
- * additional block_job_pause_all() */
- g_assert_cmpint(job->pause_count, ==, 3);
+ /* bdrv_drain_all() drains both src and target */
+ g_assert_cmpint(job->pause_count, ==, 2);
} else {
g_assert_cmpint(job->pause_count, ==, 1);
}
--
2.13.6
- [Qemu-devel] [PULL v3 10/35] qcow2: get rid of qcow2_backing_read1 routine, (continued)
- [Qemu-devel] [PULL v3 10/35] qcow2: get rid of qcow2_backing_read1 routine, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 09/35] block: Don't acquire AioContext in hmp_qemu_io(), Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 13/35] block: Open backing image in force share mode for size probe, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 11/35] block: Document that x-blockdev-change breaks quorum children list, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 14/35] block: Remove the obsolete -drive boot=on|off parameter, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 15/35] block: Remove the deprecated -hdachs option, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 12/35] nvme: Add tracing, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 19/35] block: Make bdrv_drain() driver callbacks non-recursive, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 16/35] block: Mention -drive cyls/heads/secs/trans/serial/addr in deprecation chapter, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 17/35] block: Remove unused bdrv_requests_pending, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 24/35] block: Don't block_job_pause_all() in bdrv_drain_all(),
Kevin Wolf <=
- [Qemu-devel] [PULL v3 25/35] block: Nested drain_end must still call callbacks, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 22/35] blockjob: Pause job on draining any job BDS, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 23/35] test-bdrv-drain: Test drain vs. block jobs, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 21/35] test-bdrv-drain: Test bs->quiesce_counter, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 20/35] test-bdrv-drain: Test callback for bdrv_drain, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 18/35] block: Assert drain_all is only called from main AioContext, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 26/35] test-bdrv-drain: Test nested drain sections, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 27/35] block: Don't notify parents in drain call chain, Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 28/35] block: Add bdrv_subtree_drained_begin/end(), Kevin Wolf, 2017/12/22
- [Qemu-devel] [PULL v3 30/35] test-bdrv-drain: Test behaviour in coroutine context, Kevin Wolf, 2017/12/22