mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: refactor bdrv_remove_file_or_backing_child to bdrv_remove_child

Browse Source 
Now the function can remove any child, so give it more common name.
Drop assertions and drop bs argument which becomes unused. Function
would be reused in a further commit.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220726201134.924743-16-vsementsov@yandex-team.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2022-07-26 23:11:34 +03:00 committed by Kevin Wolf
parent c5c2174146
commit 57f08941d3
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
block.c
View File

@ -92,9 +92,7 @@ static bool bdrv_recurse_has_child(BlockDriverState *bs,
static void bdrv_replace_child_noperm(BdrvChild *child, static void bdrv_replace_child_noperm(BdrvChild *child,
BlockDriverState *new_bs); BlockDriverState *new_bs);
static void bdrv_remove_file_or_backing_child(BlockDriverState *bs, static void bdrv_remove_child(BdrvChild *child, Transaction *tran);
BdrvChild *child,
Transaction *tran);
static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs, static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs,
Transaction *tran); Transaction *tran);
@ -3342,7 +3340,7 @@ static int bdrv_set_file_or_backing_noperm(BlockDriverState *parent_bs,
if (child) { if (child) {
bdrv_unset_inherits_from(parent_bs, child, tran); bdrv_unset_inherits_from(parent_bs, child, tran);
bdrv_remove_file_or_backing_child(parent_bs, child, tran); bdrv_remove_child(child, tran);
} }
if (!child_bs) { if (!child_bs) {
@ -5023,26 +5021,19 @@ static bool should_update_child(BdrvChild *c, BlockDriverState *to)
return ret; return ret;
} }
static void bdrv_remove_filter_or_cow_child_commit(void *opaque) static void bdrv_remove_child_commit(void *opaque)
{ {
GLOBAL_STATE_CODE(); GLOBAL_STATE_CODE();
bdrv_child_free(opaque); bdrv_child_free(opaque);
} }
static TransactionActionDrv bdrv_remove_filter_or_cow_child_drv = { static TransactionActionDrv bdrv_remove_child_drv = {
.commit = bdrv_remove_filter_or_cow_child_commit, .commit = bdrv_remove_child_commit,
}; };
/* /* Function doesn't update permissions, caller is responsible for this. */
* A function to remove backing or file child of @bs. static void bdrv_remove_child(BdrvChild *child, Transaction *tran)
* Function doesn't update permissions, caller is responsible for this.
*/
static void bdrv_remove_file_or_backing_child(BlockDriverState *bs,
BdrvChild *child,
Transaction *tran)
{ {
assert(child == bs->backing || child == bs->file);
if (!child) { if (!child) {
return; return;
} }
@ -5051,7 +5042,7 @@ static void bdrv_remove_file_or_backing_child(BlockDriverState *bs,
bdrv_replace_child_tran(child, NULL, tran); bdrv_replace_child_tran(child, NULL, tran);
} }
tran_add(tran, &bdrv_remove_filter_or_cow_child_drv, child); tran_add(tran, &bdrv_remove_child_drv, child);
} }
/* /*
@ -5062,7 +5053,7 @@ static void bdrv_remove_file_or_backing_child(BlockDriverState *bs,
static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs, static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs,
Transaction *tran) Transaction *tran)
{ {
bdrv_remove_file_or_backing_child(bs, bdrv_filter_or_cow_child(bs), tran); bdrv_remove_child(bdrv_filter_or_cow_child(bs), tran);
} }
static int bdrv_replace_node_noperm(BlockDriverState *from, static int bdrv_replace_node_noperm(BlockDriverState *from,