aboutsummaryrefslogtreecommitdiff
path: root/tests/test-bdrv-graph-mod.c
diff options
context:
space:
mode:
authorAlberto Garcia <berto@igalia.com>2019-05-13 16:46:17 +0300
committerMax Reitz <mreitz@redhat.com>2019-05-28 20:30:55 +0200
commitdd4118c792a8c2a104fe90274e8a41e0db1ebc56 (patch)
treeee01a1736fdb4874e6c1c82a58061b4b8ee373fe /tests/test-bdrv-graph-mod.c
parentae6b12fa4cf7d54add35531c790aaf2bd6d833f3 (diff)
block: Use bdrv_unref_child() for all children in bdrv_close()
bdrv_unref_child() does the following things: - Updates the child->bs->inherits_from pointer. - Calls bdrv_detach_child() to remove the BdrvChild from bs->children. - Calls bdrv_unref() to unref the child BlockDriverState. When bdrv_unref_child() was introduced in commit 33a604075c it was not used in bdrv_close() because the drivers that had additional children (like quorum or blkverify) had already called bdrv_unref() on their children during their own close functions. This was changed later (in 0bd6e91a7e for quorum, in 3e586be0b2 for blkverify) so there's no reason not to use bdrv_unref_child() in bdrv_close() anymore. After this there's also no need to remove bs->backing and bs->file separately from the rest of the children, so bdrv_close() can be simplified. Now bdrv_close() unrefs all children (before this patch it was only bs->file and bs->backing). As a result, none of the callers of brvd_attach_child() should remove their reference to child_bs (because this function effectively steals that reference). This patch updates a couple of tests that were doing their own bdrv_unref(). Signed-off-by: Alberto Garcia <berto@igalia.com> Message-id: 6d1d5feaa53aa1ab127adb73d605dc4503e3abd5.1557754872.git.berto@igalia.com [mreitz: s/where/were/] Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/test-bdrv-graph-mod.c')
-rw-r--r--tests/test-bdrv-graph-mod.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/test-bdrv-graph-mod.c b/tests/test-bdrv-graph-mod.c
index 283dc84869..747c0bf8fc 100644
--- a/tests/test-bdrv-graph-mod.c
+++ b/tests/test-bdrv-graph-mod.c
@@ -116,7 +116,6 @@ static void test_update_perm_tree(void)
g_assert_nonnull(local_err);
error_free(local_err);
- bdrv_unref(bs);
blk_unref(root);
}