8:54 p.m.
Add command that can add and remove filters.
Key points of functionality:
What the command does is simply replace some BdrvChild.bs by some other
nodes. The tricky thing is selecting there BdrvChild objects.
To be able to select any kind of BdrvChild we use a generic parent_id,
which may be a node-name, or qdev id or block export id. In future we
may support block jobs.
Any kind of ambiguity leads to error. If we have both device named
device0 and block export named device0 and they both point to same BDS,
user can't replace root child of one of these parents. So, to be able
to do replacements, user should avoid duplicating names in different
parent namespaces.
So, command allows to replace any single child in the graph.
On the other hand we want to realize a kind of bdrv_replace_node(),
which works well when we want to replace all parents of some node. For
this kind of task @parents-mode argument implemented.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com>
---
qapi/block-core.json | 78 +++++++++++++++++++++++++++++++++++++++++
block.c | 82 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 160 insertions(+)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 675d8265eb..8059b96341 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -5433,3 +5433,81 @@
{ 'command': 'blockdev-snapshot-delete-internal-sync',
'data': { 'device': 'str', '*id': 'str',
'*name': 'str'},
'returns': 'SnapshotInfo' }
+
+##
+# @BlockdevReplaceParentsMode:
+#
+# Alternative (to directly set @parent) way to chose parents in
+# @blockdev-replace
+#
+# @exactly-one: Exactly one parent should match a condition, otherwise
+# @blockdev-replace fails.
+#
+# @all: All matching parents are taken into account. If replacing lead
+# to loops in block graph, @blockdev-replace fails.
+#
+# @auto: Same as @all, but automatically skip replacing parents if it
+# leads to loops in block graph.
+#
+# Since: 6.2
+##
+{ 'enum': 'BlockdevReplaceParentsMode',
+ 'data': ['exactly-one', 'all', 'auto'] }
+
+##
+# @BlockdevReplace:
+#
+# Declaration of one replacement.
+#
+# @parent: id of parent. It may be qdev or block export or simple
+# node-name. If id is ambiguous (for example node-name of
+# some BDS equals to block export name), blockdev-replace
+# fails. If not specified, blockdev-replace goes through
+# @parents-mode scenario, see below. Note, that @parent and
+# @parents-mode can't be specified simultaneously.
+# If @parent is specified, only one edge is selected. If
+# several edges match the condition, blockdev-replace fails.
+#
+# @edge: name of the child. If omitted, any child name matches.
+#
+# @child: node-name of the child. If omitted, any child matches.
+# Must be present if @parent is not specified.
+#
+# @parents-mode: declares how to select edge (or edges) when @parent
+# is omitted. Default is 'one'.
+#
+# Since: 6.2
+#
+# Examples:
+#
+# 1. Change root node of some device.
+#
+# Note, that @edge name is omitted, as
+# devices always has only one child. As well, no need in specifying
+# old @child.
+#
+# -> { "parent": "device0", "new-child":
"some-node-name" }
+#
+# 2. Insert copy-before-write filter.
+#
+# Assume, after blockdev-add we have block-node 'source', with several
+# writing parents and one copy-before-write 'filter' parent. And we want
+# to actually insert the filter. We do:
+#
+# -> { "child": "source", "parent-mode":
"auto", "new-child": "filter" }
+#
+# All parents of source would be switched to 'filter' node, except for
+# 'filter' node itself (otherwise, it will make a loop in block-graph).
+##
+{ 'struct': 'BlockdevReplace',
+ 'data': { '*parent': 'str', '*edge': 'str',
'*child': 'str',
+ '*parents-mode': 'BlockdevReplaceParentsMode',
+ 'new-child': 'str' } }
+
+##
+# @blockdev-replace:
+#
+# Do one or several replacements transactionally.
+##
+{ 'command': 'blockdev-replace',
+ 'data': { 'replacements': ['BlockdevReplace'] } }
diff --git a/block.c b/block.c
index ae8c8c4032..3bcb3152f1 100644
--- a/block.c
+++ b/block.c
@@ -41,6 +41,7 @@
#include "qapi/qmp/qnull.h"
#include "qapi/qmp/qstring.h"
#include "qapi/qobject-output-visitor.h"
+#include "qapi/qapi-commands-block.h"
#include "qapi/qapi-visit-block-core.h"
#include "sysemu/block-backend.h"
#include "qemu/notify.h"
@@ -7717,6 +7718,87 @@ BlockDriverState *bdrv_backing_chain_next(BlockDriverState *bs)
return bdrv_skip_filters(bdrv_cow_bs(bdrv_skip_filters(bs)));
}
+void qmp_blockdev_replace(BlockdevReplaceList *list, Error **errp)
+{
+ int ret;
+ Transaction *tran = tran_new();
+ g_autoptr(GHashTable) found = NULL;
+ g_autoptr(GSList) refresh_list = NULL;
+ g_autoptr(GSList) touched_list = NULL;
+ GSList *x;
+
+ for ( ; list; list = list->next) {
+ BlockdevReplace *repl = list->value;
+ BlockDriverState *child_bs = NULL, *new_child_bs;
+ BlockdevReplaceParentsMode mode;
+ BdrvChild *child;
+
+ if (repl->has_child) {
+ child_bs = bdrv_find_node(repl->child);
+ if (!child_bs) {
+ error_setg(errp, "Node '%s' not found",
repl->child);
+ goto fail;
+ }
+ }
+
+ new_child_bs = bdrv_find_node(repl->new_child);
+ if (!new_child_bs) {
+ error_setg(errp, "Node '%s' not found",
repl->new_child);
+ goto fail;
+ }
+
+ if (repl->has_parent) {
+ if (repl->has_parents_mode) {
+ error_setg(errp, "parent and parents-mode field must "
+ "not be set simultaneously.");
+ goto fail;
+ }
+
+ child = block_find_child(repl->parent, repl->edge, child_bs, errp);
+ if (!child) {
+ goto fail;
+ }
+
+ touched_list = g_slist_prepend(touched_list, child->bs);
+ touched_list = g_slist_prepend(touched_list, new_child_bs);
+ bdrv_replace_child_tran(child, new_child_bs, tran);
+ continue;
+ }
+
+ if (!repl->has_child) {
+ error_setg(errp, "At least one of parent and child fields "
+ "should be specified.");
+ goto fail;
+ }
+
+ mode = repl->has_parents_mode ? repl->parents_mode :
+ BLOCKDEV_REPLACE_PARENTS_MODE_EXACTLY_ONE;
+
+ touched_list = g_slist_prepend(touched_list, child_bs);
+ touched_list = g_slist_prepend(touched_list, new_child_bs);
+ ret = bdrv_replace_node_noperm(child_bs, new_child_bs,
+ mode == BLOCKDEV_REPLACE_PARENTS_MODE_AUTO,
+ repl->edge,
+ mode == BLOCKDEV_REPLACE_PARENTS_MODE_EXACTLY_ONE,
+ tran, errp);
+ if (ret < 0) {
+ goto fail;
+ }
+ }
+
+ for (x = touched_list; x; x = x->next) {
+ refresh_list = bdrv_topological_dfs(refresh_list, found, x->data);
+ }
+
+ ret = bdrv_list_refresh_perms(refresh_list, NULL, tran, errp);
+
+ tran_finalize(tran, ret);
+ return;
+
+fail:
+ tran_abort(tran);
+}
+
static void block_c_init(void)
{
block_parent_class_register(&block_parent_bdrv);
--
2.29.2