From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com, famz@redhat.com,
qemu-devel@nongnu.org, qemu-stable@nongnu.org
Subject: [Qemu-devel] [PATCH v2 4/6] block: bdrv_drain_recurse(): Remove unused begin parameter
Date: Wed, 6 Dec 2017 11:53:07 +0100 [thread overview]
Message-ID: <20171206105309.3468-5-kwolf@redhat.com> (raw)
In-Reply-To: <20171206105309.3468-1-kwolf@redhat.com>
Now that the bdrv_drain_invoke() calls are pulled up to the callers of
bdrv_drain_recurse(), the 'begin' parameter isn't needed any more.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/io.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/io.c b/block/io.c
index 603f5b059e..390d463c71 100644
--- a/block/io.c
+++ b/block/io.c
@@ -195,7 +195,7 @@ static void bdrv_drain_invoke(BlockDriverState *bs, bool begin)
}
}
-static bool bdrv_drain_recurse(BlockDriverState *bs, bool begin)
+static bool bdrv_drain_recurse(BlockDriverState *bs)
{
BdrvChild *child, *tmp;
bool waited;
@@ -218,7 +218,7 @@ static bool bdrv_drain_recurse(BlockDriverState *bs, bool begin)
*/
bdrv_ref(bs);
}
- waited |= bdrv_drain_recurse(bs, begin);
+ waited |= bdrv_drain_recurse(bs);
if (in_main_loop) {
bdrv_unref(bs);
}
@@ -283,7 +283,7 @@ void bdrv_drained_begin(BlockDriverState *bs)
}
bdrv_drain_invoke(bs, true);
- bdrv_drain_recurse(bs, true);
+ bdrv_drain_recurse(bs);
}
void bdrv_drained_end(BlockDriverState *bs)
@@ -299,7 +299,7 @@ void bdrv_drained_end(BlockDriverState *bs)
bdrv_parent_drained_end(bs);
bdrv_drain_invoke(bs, false);
- bdrv_drain_recurse(bs, false);
+ bdrv_drain_recurse(bs);
aio_enable_external(bdrv_get_aio_context(bs));
}
@@ -378,7 +378,7 @@ 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)) {
- waited |= bdrv_drain_recurse(bs, true);
+ waited |= bdrv_drain_recurse(bs);
}
}
aio_context_release(aio_context);
@@ -400,7 +400,7 @@ void bdrv_drain_all_end(void)
aio_enable_external(aio_context);
bdrv_parent_drained_end(bs);
bdrv_drain_invoke(bs, false);
- bdrv_drain_recurse(bs, false);
+ bdrv_drain_recurse(bs);
aio_context_release(aio_context);
}
--
2.13.6
next prev parent reply other threads:[~2017-12-06 10:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-06 10:53 [Qemu-devel] [PATCH v2 0/6] block: Fix BlockDriver callbacks in bdrv_drain_all_begin() Kevin Wolf
2017-12-06 10:53 ` [Qemu-devel] [PATCH v2 1/6] block: Make bdrv_drain_invoke() recursive Kevin Wolf
2017-12-06 10:53 ` [Qemu-devel] [PATCH v2 2/6] block: Call .drain_begin only once in bdrv_drain_all_begin() Kevin Wolf
2017-12-06 10:53 ` [Qemu-devel] [PATCH v2 3/6] test-bdrv-drain: Test BlockDriver callbacks for drain Kevin Wolf
2017-12-08 15:18 ` Eric Blake
2017-12-06 10:53 ` Kevin Wolf [this message]
2017-12-06 10:53 ` [Qemu-devel] [PATCH v2 5/6] block: Don't wait for requests in bdrv_drain*_end() Kevin Wolf
2017-12-06 11:06 ` Paolo Bonzini
2017-12-06 11:06 ` Paolo Bonzini
2017-12-06 10:53 ` [Qemu-devel] [PATCH v2 6/6] block: Unify order in drain functions Kevin Wolf
2017-12-08 10:52 ` [Qemu-devel] [PATCH v2 0/6] block: Fix BlockDriver callbacks in bdrv_drain_all_begin() Stefan Hajnoczi
2017-12-08 16:31 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171206105309.3468-5-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=famz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).