From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, kwolf@redhat.com, hreitz@redhat.com,
vsementsov@yandex-team.ru
Subject: [PATCH v7 11/15] Revert "block: Restructure remove_file_or_backing_child()"
Date: Tue, 26 Jul 2022 23:11:30 +0300 [thread overview]
Message-ID: <20220726201134.924743-12-vsementsov@yandex-team.ru> (raw)
In-Reply-To: <20220726201134.924743-1-vsementsov@yandex-team.ru>
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 562bda8bb41879eeda0bd484dd3d55134579b28e.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
block.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/block.c b/block.c
index 1b9e0a2d79..5eefadf768 100644
--- a/block.c
+++ b/block.c
@@ -5053,33 +5053,30 @@ static void bdrv_remove_file_or_backing_child(BlockDriverState *bs,
BdrvChild *child,
Transaction *tran)
{
- BdrvChild **childp;
BdrvRemoveFilterOrCowChild *s;
+ assert(child == bs->backing || child == bs->file);
+
if (!child) {
return;
}
- if (child == bs->backing) {
- childp = &bs->backing;
- } else if (child == bs->file) {
- childp = &bs->file;
- } else {
- g_assert_not_reached();
- }
-
if (child->bs) {
- bdrv_replace_child_tran(*childp, NULL, tran);
+ bdrv_replace_child_tran(child, NULL, tran);
}
s = g_new(BdrvRemoveFilterOrCowChild, 1);
*s = (BdrvRemoveFilterOrCowChild) {
.child = child,
- .is_backing = (childp == &bs->backing),
+ .is_backing = (child == bs->backing),
};
tran_add(tran, &bdrv_remove_filter_or_cow_child_drv, s);
- *childp = NULL;
+ if (s->is_backing) {
+ bs->backing = NULL;
+ } else {
+ bs->file = NULL;
+ }
}
/*
--
2.25.1
next prev parent reply other threads:[~2022-07-26 20:30 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-26 20:11 [PATCH v7 for-7.2 00/15] block: cleanup backing and file handling Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 01/15] block: BlockDriver: add .filtered_child_is_backing field Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 02/15] block: introduce bdrv_open_file_child() helper Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 03/15] block/blklogwrites: don't care to remove bs->file child on failure Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 04/15] test-bdrv-graph-mod: update test_parallel_perm_update test case Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 05/15] tests-bdrv-drain: bdrv_replace_test driver: declare supports_backing Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 06/15] test-bdrv-graph-mod: fix filters to be filters Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 07/15] block: document connection between child roles and bs->backing/bs->file Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 08/15] block/snapshot: stress that we fallback to primary child Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 09/15] Revert "block: Let replace_child_noperm free children" Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 10/15] Revert "block: Let replace_child_tran keep indirect pointer" Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` Vladimir Sementsov-Ogievskiy [this message]
2022-07-26 20:11 ` [PATCH v7 12/15] Revert "block: Pass BdrvChild ** to replace_child_noperm" Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 13/15] block: Manipulate bs->file / bs->backing pointers in .attach/.detach Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 14/15] block/snapshot: drop indirection around bdrv_snapshot_fallback_ptr Vladimir Sementsov-Ogievskiy
2022-07-26 20:11 ` [PATCH v7 15/15] block: refactor bdrv_remove_file_or_backing_child to bdrv_remove_child Vladimir Sementsov-Ogievskiy
2022-09-19 17:20 ` [PATCH v7 for-7.2 00/15] block: cleanup backing and file handling Vladimir Sementsov-Ogievskiy
2022-10-12 13:27 ` Vladimir Sementsov-Ogievskiy
2022-10-24 11:26 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220726201134.924743-12-vsementsov@yandex-team.ru \
--to=vsementsov@yandex-team.ru \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.