[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 7/9] block: Fix BDS children's .drained_end()
|
From: |
Max Reitz |
|
Subject: |
[Qemu-block] [PATCH v2 7/9] block: Fix BDS children's .drained_end() |
|
Date: |
Wed, 19 Jun 2019 17:26:01 +0200 |
BdrvChildRole.drained_end() must not poll, bdrv_child_cb_drained_end()
should use bdrv_drained_end_no_poll() instead of bdrv_drained_end().
The existing implementation works perfectly well for
.drained_end_unquiesce(), though, so use it there.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/block.c b/block.c
index 31b85df0f0..1652f3d29b 100644
--- a/block.c
+++ b/block.c
@@ -912,6 +912,12 @@ static bool bdrv_child_cb_drained_poll(BdrvChild *child)
}
static void bdrv_child_cb_drained_end(BdrvChild *child)
+{
+ BlockDriverState *bs = child->opaque;
+ bdrv_drained_end_no_poll(bs);
+}
+
+static void bdrv_child_cb_drained_end_unquiesce(BdrvChild *child)
{
BlockDriverState *bs = child->opaque;
bdrv_drained_end(bs);
@@ -1014,6 +1020,7 @@ const BdrvChildRole child_file = {
.drained_begin = bdrv_child_cb_drained_begin,
.drained_poll = bdrv_child_cb_drained_poll,
.drained_end = bdrv_child_cb_drained_end,
+ .drained_end_unquiesce = bdrv_child_cb_drained_end_unquiesce,
.attach = bdrv_child_cb_attach,
.detach = bdrv_child_cb_detach,
.inactivate = bdrv_child_cb_inactivate,
@@ -1042,6 +1049,7 @@ const BdrvChildRole child_format = {
.drained_begin = bdrv_child_cb_drained_begin,
.drained_poll = bdrv_child_cb_drained_poll,
.drained_end = bdrv_child_cb_drained_end,
+ .drained_end_unquiesce = bdrv_child_cb_drained_end_unquiesce,
.attach = bdrv_child_cb_attach,
.detach = bdrv_child_cb_detach,
.inactivate = bdrv_child_cb_inactivate,
@@ -1168,6 +1176,7 @@ const BdrvChildRole child_backing = {
.drained_begin = bdrv_child_cb_drained_begin,
.drained_poll = bdrv_child_cb_drained_poll,
.drained_end = bdrv_child_cb_drained_end,
+ .drained_end_unquiesce = bdrv_child_cb_drained_end_unquiesce,
.inactivate = bdrv_child_cb_inactivate,
.update_filename = bdrv_backing_update_filename,
.can_set_aio_ctx = bdrv_child_cb_can_set_aio_ctx,
--
2.21.0
- [Qemu-block] [PATCH v2 0/9] block: Delay poll when ending drained sections, Max Reitz, 2019/06/19
- [Qemu-block] [PATCH v2 4/9] block: Move polling out of bdrv_drain_invoke(), Max Reitz, 2019/06/19
- [Qemu-block] [PATCH v2 2/9] block: Add @data_objs to bdrv_drain_invoke(), Max Reitz, 2019/06/19
- [Qemu-block] [PATCH v2 6/9] block: Add bdrv_drained_end_no_poll(), Max Reitz, 2019/06/19
- [Qemu-block] [PATCH v2 5/9] block: Add @poll to bdrv_parent_drained_end_single(), Max Reitz, 2019/06/19
- [Qemu-block] [PATCH v2 1/9] block: Introduce BdrvChild.parent_quiesce_counter, Max Reitz, 2019/06/19
- [Qemu-block] [PATCH v2 7/9] block: Fix BDS children's .drained_end(),
Max Reitz <=
- [Qemu-block] [PATCH v2 8/9] iotests: Add @has_quit to vm.shutdown(), Max Reitz, 2019/06/19
- [Qemu-block] [PATCH v2 9/9] iotests: Test commit with a filter on the chain, Max Reitz, 2019/06/19
- [Qemu-block] [PATCH v2 3/9] block: Add bdrv_poll_drain_data_objs(), Max Reitz, 2019/06/19