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 26/39] block: make bdrv_unset_inherits_from to be a transaction action
Date: Fri, 30 Apr 2021 12:51:34 +0200 [thread overview]
Message-ID: <20210430105147.125840-27-kwolf@redhat.com> (raw)
In-Reply-To: <20210430105147.125840-1-kwolf@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To be used in the further commit.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210428151804.439460-27-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block.c | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 42 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index 46af5852ab..1dc14908ac 100644
--- a/block.c
+++ b/block.c
@@ -3205,11 +3205,49 @@ void bdrv_root_unref_child(BdrvChild *child)
bdrv_unref(child_bs);
}
+typedef struct BdrvSetInheritsFrom {
+ BlockDriverState *bs;
+ BlockDriverState *old_inherits_from;
+} BdrvSetInheritsFrom;
+
+static void bdrv_set_inherits_from_abort(void *opaque)
+{
+ BdrvSetInheritsFrom *s = opaque;
+
+ s->bs->inherits_from = s->old_inherits_from;
+}
+
+static TransactionActionDrv bdrv_set_inherits_from_drv = {
+ .abort = bdrv_set_inherits_from_abort,
+ .clean = g_free,
+};
+
+/* @tran is allowed to be NULL. In this case no rollback is possible */
+static void bdrv_set_inherits_from(BlockDriverState *bs,
+ BlockDriverState *new_inherits_from,
+ Transaction *tran)
+{
+ if (tran) {
+ BdrvSetInheritsFrom *s = g_new(BdrvSetInheritsFrom, 1);
+
+ *s = (BdrvSetInheritsFrom) {
+ .bs = bs,
+ .old_inherits_from = bs->inherits_from,
+ };
+
+ tran_add(tran, &bdrv_set_inherits_from_drv, s);
+ }
+
+ bs->inherits_from = new_inherits_from;
+}
+
/**
* Clear all inherits_from pointers from children and grandchildren of
* @root that point to @root, where necessary.
+ * @tran is allowed to be NULL. In this case no rollback is possible
*/
-static void bdrv_unset_inherits_from(BlockDriverState *root, BdrvChild *child)
+static void bdrv_unset_inherits_from(BlockDriverState *root, BdrvChild *child,
+ Transaction *tran)
{
BdrvChild *c;
@@ -3224,12 +3262,12 @@ static void bdrv_unset_inherits_from(BlockDriverState *root, BdrvChild *child)
}
}
if (c == NULL) {
- child->bs->inherits_from = NULL;
+ bdrv_set_inherits_from(child->bs, NULL, tran);
}
}
QLIST_FOREACH(c, &child->bs->children, next) {
- bdrv_unset_inherits_from(root, c);
+ bdrv_unset_inherits_from(root, c, tran);
}
}
@@ -3240,7 +3278,7 @@ void bdrv_unref_child(BlockDriverState *parent, BdrvChild *child)
return;
}
- bdrv_unset_inherits_from(parent, child);
+ bdrv_unset_inherits_from(parent, child, NULL);
bdrv_root_unref_child(child);
}
--
2.30.2
next prev parent reply other threads:[~2021-04-30 11:49 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 10:51 [PULL 00/39] Block layer patches Kevin Wolf
2021-04-30 10:51 ` [PULL 01/39] tests/test-bdrv-graph-mod: add test_parallel_exclusive_write Kevin Wolf
2021-04-30 10:51 ` [PULL 02/39] tests/test-bdrv-graph-mod: add test_parallel_perm_update Kevin Wolf
2021-04-30 10:51 ` [PULL 03/39] tests/test-bdrv-graph-mod: add test_append_greedy_filter Kevin Wolf
2021-04-30 10:51 ` [PULL 04/39] block: bdrv_append(): don't consume reference Kevin Wolf
2021-04-30 10:51 ` [PULL 05/39] block: BdrvChildClass: add .get_parent_aio_context handler Kevin Wolf
2021-04-30 10:51 ` [PULL 06/39] block: drop ctx argument from bdrv_root_attach_child Kevin Wolf
2021-04-30 10:51 ` [PULL 07/39] block: make bdrv_reopen_{prepare,commit,abort} private Kevin Wolf
2021-04-30 10:51 ` [PULL 08/39] util: add transactions.c Kevin Wolf
2021-04-30 10:51 ` [PULL 09/39] block: bdrv_refresh_perms: check for parents permissions conflict Kevin Wolf
2021-04-30 10:51 ` [PULL 10/39] block: refactor bdrv_child* permission functions Kevin Wolf
2021-04-30 10:51 ` [PULL 11/39] block: rewrite bdrv_child_try_set_perm() using bdrv_refresh_perms() Kevin Wolf
2021-04-30 10:51 ` [PULL 12/39] block: inline bdrv_child_*() permission functions calls Kevin Wolf
2021-04-30 10:51 ` [PULL 13/39] block: use topological sort for permission update Kevin Wolf
2021-04-30 10:51 ` [PULL 14/39] block: add bdrv_drv_set_perm transaction action Kevin Wolf
2021-04-30 10:51 ` [PULL 15/39] block: add bdrv_list_* permission update functions Kevin Wolf
2021-04-30 10:51 ` [PULL 16/39] block: add bdrv_replace_child_safe() transaction action Kevin Wolf
2021-04-30 10:51 ` [PULL 17/39] block: fix bdrv_replace_node_common Kevin Wolf
2021-04-30 10:51 ` [PULL 18/39] block: add bdrv_attach_child_common() transaction action Kevin Wolf
2021-04-30 22:33 ` Peter Maydell
2021-04-30 10:51 ` [PULL 19/39] block: add bdrv_attach_child_noperm() " Kevin Wolf
2021-04-30 10:51 ` [PULL 20/39] block: split out bdrv_replace_node_noperm() Kevin Wolf
2021-04-30 10:51 ` [PULL 21/39] block: adapt bdrv_append() for inserting filters Kevin Wolf
2021-04-30 10:51 ` [PULL 22/39] block: add bdrv_remove_filter_or_cow transaction action Kevin Wolf
2021-04-30 10:51 ` [PULL 23/39] block: introduce bdrv_drop_filter() Kevin Wolf
2021-04-30 10:51 ` [PULL 24/39] block/backup-top: drop .active Kevin Wolf
2021-04-30 10:51 ` [PULL 25/39] block: drop ignore_children for permission update functions Kevin Wolf
2021-04-30 10:51 ` Kevin Wolf [this message]
2021-04-30 10:51 ` [PULL 27/39] block: make bdrv_refresh_limits() to be a transaction action Kevin Wolf
2021-04-30 10:51 ` [PULL 28/39] block: add bdrv_set_backing_noperm() " Kevin Wolf
2021-04-30 10:51 ` [PULL 29/39] block: bdrv_reopen_multiple(): move bdrv_flush to separate pre-prepare Kevin Wolf
2021-04-30 10:51 ` [PULL 30/39] block: bdrv_reopen_multiple: refresh permissions on updated graph Kevin Wolf
2021-04-30 22:38 ` Peter Maydell
2021-04-30 10:51 ` [PULL 31/39] block: drop unused permission update functions Kevin Wolf
2021-04-30 10:51 ` [PULL 32/39] block: inline bdrv_check_perm_common() Kevin Wolf
2021-04-30 10:51 ` [PULL 33/39] block: inline bdrv_replace_child() Kevin Wolf
2021-04-30 10:51 ` [PULL 34/39] block: refactor bdrv_child_set_perm_safe() transaction action Kevin Wolf
2021-04-30 10:51 ` [PULL 35/39] block: rename bdrv_replace_child_safe() to bdrv_replace_child() Kevin Wolf
2021-04-30 10:51 ` [PULL 36/39] block: refactor bdrv_node_check_perm() Kevin Wolf
2021-04-30 10:51 ` [PULL 37/39] block: Add BDRV_O_NO_SHARE for blk_new_open() Kevin Wolf
2021-04-30 10:51 ` [PULL 38/39] qemu-img convert: Unshare write permission for source Kevin Wolf
2021-04-30 10:51 ` [PULL 39/39] vhost-user-blk: Fail gracefully on too large queue size Kevin Wolf
2021-04-30 15:00 ` [PULL 00/39] Block layer patches Peter Maydell
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=20210430105147.125840-27-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).