motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-19 16:12:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "block: Restructure remove_file_or_backing_child()"

Browse source 
That's a preparation to previously reverted
"block: Let replace_child_noperm free children". Drop it too, we don't
need it for a new approach.

This reverts commit 562bda8bb4.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220726201134.924743-12-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:30 +03:00 • committed by Kevin Wolf
parent 0f0b1e29d3
commit a2c37a3042
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
block.c
View file

@ -5055,33 +5055,30 @@ static void bdrv_remove_file_or_backing_child(BlockDriverState *bs,
BdrvChild *child, BdrvChild *child,
Transaction *tran) Transaction *tran)
{ {
BdrvChild **childp;
BdrvRemoveFilterOrCowChild *s; BdrvRemoveFilterOrCowChild *s;
assert(child == bs->backing || child == bs->file);
if (!child) { if (!child) {
return; return;
} }
if (child == bs->backing) {
childp = &bs->backing;
} else if (child == bs->file) {
childp = &bs->file;
} else {
g_assert_not_reached();
}
if (child->bs) { if (child->bs) {
bdrv_replace_child_tran(*childp, NULL, tran); bdrv_replace_child_tran(child, NULL, tran);
} }
s = g_new(BdrvRemoveFilterOrCowChild, 1); s = g_new(BdrvRemoveFilterOrCowChild, 1);
*s = (BdrvRemoveFilterOrCowChild) { *s = (BdrvRemoveFilterOrCowChild) {
.child = child, .child = child,
.is_backing = (childp == &bs->backing), .is_backing = (child == bs->backing),
}; };
tran_add(tran, &bdrv_remove_filter_or_cow_child_drv, s); tran_add(tran, &bdrv_remove_filter_or_cow_child_drv, s);
*childp = NULL; if (s->is_backing) {
bs->backing = NULL;
} else {
bs->file = NULL;
}
} }
/* /*