From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 06/13] block: Restructure remove_file_or_backing_child()
Date: Mon, 15 Nov 2021 15:54:02 +0100 [thread overview]
Message-ID: <20211115145409.176785-7-kwolf@redhat.com> (raw)
In-Reply-To: <20211115145409.176785-1-kwolf@redhat.com>
From: Hanna Reitz <hreitz@redhat.com>
As of a future patch, bdrv_replace_child_tran() will take a BdrvChild **
pointer. Prepare for that by getting such a pointer and using it where
applicable, and (dereferenced) as a parameter for
bdrv_replace_child_tran().
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20211111120829.81329-7-hreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/block.c b/block.c
index d668156eca..8da057f800 100644
--- a/block.c
+++ b/block.c
@@ -4887,30 +4887,33 @@ 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(child, NULL, tran);
+ bdrv_replace_child_tran(*childp, NULL, tran);
}
s = g_new(BdrvRemoveFilterOrCowChild, 1);
*s = (BdrvRemoveFilterOrCowChild) {
.child = child,
- .is_backing = (child == bs->backing),
+ .is_backing = (childp == &bs->backing),
};
tran_add(tran, &bdrv_remove_filter_or_cow_child_drv, s);
- if (s->is_backing) {
- bs->backing = NULL;
- } else {
- bs->file = NULL;
- }
+ *childp = NULL;
}
/*
--
2.31.1
next prev parent reply other threads:[~2021-11-15 15:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 14:53 [PULL 00/13] Block layer patches Kevin Wolf
2021-11-15 14:53 ` [PULL 01/13] stream: Traverse graph after modification Kevin Wolf
2021-11-15 14:53 ` [PULL 02/13] block: Manipulate children list in .attach/.detach Kevin Wolf
2021-11-15 14:53 ` [PULL 03/13] block: Unite remove_empty_child and child_free Kevin Wolf
2021-11-15 14:54 ` [PULL 04/13] block: Drop detached child from ignore list Kevin Wolf
2021-11-15 14:54 ` [PULL 05/13] block: Pass BdrvChild ** to replace_child_noperm Kevin Wolf
2021-11-15 14:54 ` Kevin Wolf [this message]
2021-11-15 14:54 ` [PULL 07/13] transactions: Invoke clean() after everything else Kevin Wolf
2021-11-15 14:54 ` [PULL 08/13] block: Let replace_child_tran keep indirect pointer Kevin Wolf
2021-11-15 14:54 ` [PULL 09/13] block: Let replace_child_noperm free children Kevin Wolf
2021-11-15 14:54 ` [PULL 10/13] iotests/030: Unthrottle parallel jobs in reverse Kevin Wolf
2021-11-15 14:54 ` [PULL 11/13] docs: Deprecate incorrectly typed device_add arguments Kevin Wolf
2021-11-15 14:54 ` [PULL 12/13] file-posix: Fix alignment after reopen changing O_DIRECT Kevin Wolf
2021-11-15 14:54 ` [PULL 13/13] softmmu/qdev-monitor: fix use-after-free in qdev_set_id() Kevin Wolf
2021-11-15 20:55 ` [PULL 00/13] Block layer patches Richard Henderson
2021-11-16 8:49 ` Hanna Reitz
2021-11-15 20:59 ` Philippe Mathieu-Daudé
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=20211115145409.176785-7-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).