[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 06/13] block: Restructure remove_file_or_backing_child()
From: |
Hanna Reitz |
Subject: |
[PULL v2 06/13] block: Restructure remove_file_or_backing_child() |
Date: |
Tue, 16 Nov 2021 14:06:11 +0100 |
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>
Message-Id: <20211115145409.176785-7-kwolf@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@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.33.1
- [PULL v2 00/13] Block patches, Hanna Reitz, 2021/11/16
- [PULL v2 02/13] block: Manipulate children list in .attach/.detach, Hanna Reitz, 2021/11/16
- [PULL v2 03/13] block: Unite remove_empty_child and child_free, Hanna Reitz, 2021/11/16
- [PULL v2 04/13] block: Drop detached child from ignore list, Hanna Reitz, 2021/11/16
- [PULL v2 06/13] block: Restructure remove_file_or_backing_child(),
Hanna Reitz <=
- [PULL v2 05/13] block: Pass BdrvChild ** to replace_child_noperm, Hanna Reitz, 2021/11/16
- [PULL v2 07/13] transactions: Invoke clean() after everything else, Hanna Reitz, 2021/11/16
- [PULL v2 08/13] block: Let replace_child_tran keep indirect pointer, Hanna Reitz, 2021/11/16
- [PULL v2 10/13] iotests/030: Unthrottle parallel jobs in reverse, Hanna Reitz, 2021/11/16
- [PULL v2 11/13] docs: Deprecate incorrectly typed device_add arguments, Hanna Reitz, 2021/11/16
- [PULL v2 09/13] block: Let replace_child_noperm free children, Hanna Reitz, 2021/11/16
- [PULL v2 12/13] softmmu/qdev-monitor: fix use-after-free in qdev_set_id(), Hanna Reitz, 2021/11/16
- [PULL v2 13/13] file-posix: Fix alignment after reopen changing O_DIRECT, Hanna Reitz, 2021/11/16
- [PULL v2 01/13] stream: Traverse graph after modification, Hanna Reitz, 2021/11/16
- Re: [PULL v2 00/13] Block patches, Richard Henderson, 2021/11/16