@@ -1320,15 +1320,18 @@ static void detach_by_parent_aio_cb(void *opaque, int ret)
}
}
+static BdrvChildClass detach_by_driver_cb_class;
+
static void detach_by_driver_cb_drained_begin(BdrvChild *child)
{
+ /* restore .drained_begin cb, we don't need it anymore. */
+ detach_by_driver_cb_class.drained_begin = child_of_bds.drained_begin;
+
aio_bh_schedule_oneshot(qemu_get_current_aio_context(),
detach_indirect_bh, &detach_by_parent_data);
child_of_bds.drained_begin(child);
}
-static BdrvChildClass detach_by_driver_cb_class;
-
/*
* Initial graph:
*
@@ -1360,8 +1363,6 @@ static void test_detach_indirect(bool by_parent_cb)
if (!by_parent_cb) {
detach_by_driver_cb_class = child_of_bds;
- detach_by_driver_cb_class.drained_begin =
- detach_by_driver_cb_drained_begin;
}
/* Create all involved nodes */
@@ -1419,6 +1420,12 @@ static void test_detach_indirect(bool by_parent_cb)
acb = blk_aio_preadv(blk, 0, &qiov, 0, detach_by_parent_aio_cb, NULL);
g_assert(acb != NULL);
+ if (!by_parent_cb) {
+ /* set .drained_begin cb to run only in the following drain. */
+ detach_by_driver_cb_class.drained_begin =
+ detach_by_driver_cb_drained_begin;
+ }
+
/* Drain and check the expected result */
bdrv_subtree_drained_begin(parent_b);
There will be a problem in this test when we will add subtree drains in bdrv_replace_child_noperm: test_detach_indirect is only interested in observing the first call to .drained_begin. In the original test, there was only a single subtree drain; however, with additional drains introduced in bdrv_replace_child_noperm(), the test callback would be called too early and/or multiple times. Override the callback only when we actually want to use it, and put back the original after it's been invoked. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> --- tests/unit/test-bdrv-drain.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)