From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, armbru@redhat.com, eblake@redhat.com,
crosa@redhat.com, ehabkost@redhat.com, berrange@redhat.com,
pbonzini@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com,
mreitz@redhat.com, kwolf@redhat.com
Subject: [PATCH v6 01/33] block: introduce bdrv_replace_child_bs()
Date: Wed, 21 Jul 2021 13:05:23 +0300 [thread overview]
Message-ID: <20210721100555.45594-2-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210721100555.45594-1-vsementsov@virtuozzo.com>
Add function to transactionally replace bs inside BdrvChild.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
include/block/block.h | 2 ++
block.c | 31 +++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/include/block/block.h b/include/block/block.h
index 3477290f9a..740038a892 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -361,6 +361,8 @@ int bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top,
Error **errp);
int bdrv_replace_node(BlockDriverState *from, BlockDriverState *to,
Error **errp);
+int bdrv_replace_child_bs(BdrvChild *child, BlockDriverState *new_bs,
+ Error **errp);
BlockDriverState *bdrv_insert_node(BlockDriverState *bs, QDict *node_options,
int flags, Error **errp);
int bdrv_drop_filter(BlockDriverState *bs, Error **errp);
diff --git a/block.c b/block.c
index be083f389e..94a556e61d 100644
--- a/block.c
+++ b/block.c
@@ -5048,6 +5048,37 @@ out:
return ret;
}
+/* Not for empty child */
+int bdrv_replace_child_bs(BdrvChild *child, BlockDriverState *new_bs,
+ Error **errp)
+{
+ int ret;
+ Transaction *tran = tran_new();
+ g_autoptr(GHashTable) found = NULL;
+ g_autoptr(GSList) refresh_list = NULL;
+ BlockDriverState *old_bs = child->bs;
+
+ bdrv_ref(old_bs);
+ bdrv_drained_begin(old_bs);
+ bdrv_drained_begin(new_bs);
+
+ bdrv_replace_child_tran(child, new_bs, tran);
+
+ found = g_hash_table_new(NULL, NULL);
+ refresh_list = bdrv_topological_dfs(refresh_list, found, old_bs);
+ refresh_list = bdrv_topological_dfs(refresh_list, found, new_bs);
+
+ ret = bdrv_list_refresh_perms(refresh_list, NULL, tran, errp);
+
+ tran_finalize(tran, ret);
+
+ bdrv_drained_end(old_bs);
+ bdrv_drained_end(new_bs);
+ bdrv_unref(old_bs);
+
+ return ret;
+}
+
static void bdrv_delete(BlockDriverState *bs)
{
assert(bdrv_op_blocker_is_empty(bs));
--
2.29.2
next prev parent reply other threads:[~2021-07-21 10:16 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 10:05 [PATCH v6 00/33] block: publish backup-top filter Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` Vladimir Sementsov-Ogievskiy [this message]
2021-07-21 10:05 ` [PATCH v6 02/33] block: introduce blk_replace_bs Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 03/33] qdev-properties: PropertyInfo: add realized_set_allowed field Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 04/33] qdev: allow setting drive property for realized device Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 05/33] block: rename backup-top to copy-before-write Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 06/33] block-copy: always set BDRV_REQ_SERIALISING flag Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 07/33] block/block-copy: introduce block_copy_set_copy_opts() Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 08/33] block/backup: set copy_range and compress after filter insertion Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 09/33] block/backup: move cluster size calculation to block-copy Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 10/33] block/copy-before-write: relax permission requirements when no parents Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 11/33] block/copy-before-write: drop extra bdrv_unref on failure path Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 12/33] block/copy-before-write: use file child instead of backing Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 13/33] block/copy-before-write: bdrv_cbw_append(): replace child at last Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 14/33] block/copy-before-write: introduce cbw_init() Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 15/33] block/copy-before-write: cbw_init(): rename variables Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 16/33] block/copy-before-write: cbw_init(): use file child after attaching Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 17/33] block/copy-before-write: bdrv_cbw_append(): drop unused compress arg Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 18/33] block/copy-before-write: cbw_init(): use options Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 19/33] block/copy-before-write: initialize block-copy bitmap Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 20/33] block/block-copy: make setting progress optional Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 21/33] block/copy-before-write: make public block driver Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 22/33] qapi: publish copy-before-write filter Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 23/33] python/qemu/machine.py: refactor _qemu_args() Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 24/33] python/qemu/machine: QEMUMachine: improve qmp() method Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 25/33] iotests.py: VM: add own __enter__ method Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 26/33] iotests/222: fix pylint and mypy complains Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 27/33] iotests/222: constantly use single quotes for strings Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 28/33] iotests: move 222 to tests/image-fleecing Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 29/33] iotests.py: hmp_qemu_io: support qdev Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 30/33] iotests/image-fleecing: proper source device Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 31/33] iotests/image-fleecing: rename tgt_node Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 32/33] iotests/image-fleecing: prepare for adding new test-case Vladimir Sementsov-Ogievskiy
2021-07-21 10:05 ` [PATCH v6 33/33] iotests/image-fleecing: add test-case for copy-before-write filter Vladimir Sementsov-Ogievskiy
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=20210721100555.45594-2-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@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 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).