From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeIGF-0005kH-BT for qemu-devel@nongnu.org; Tue, 22 Sep 2015 03:45:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZeIGD-0003CO-TG for qemu-devel@nongnu.org; Tue, 22 Sep 2015 03:45:11 -0400 From: Wen Congyang Date: Tue, 22 Sep 2015 15:44:21 +0800 Message-ID: <1442907862-21376-4-git-send-email-wency@cn.fujitsu.com> In-Reply-To: <1442907862-21376-1-git-send-email-wency@cn.fujitsu.com> References: <1442907862-21376-1-git-send-email-wency@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v5 3/4] qmp: add monitor command to add/remove a child List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu devel , Eric Blake , Markus Armbruster , Alberto Garcia , Stefan Hajnoczi Cc: Kevin Wolf , qemu block , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , Gonglei , Yang Hongyang , zhanghailiang The new QMP command name is x-blockdev-child-add, and x-blockdev-child-del. It justs for adding/removing quorum's child now, and don't support all kinds of children, nor all block drivers. So it is experimental now. Signed-off-by: Wen Congyang Signed-off-by: zhanghailiang Signed-off-by: Gonglei --- blockdev.c | 48 +++++++++++++++++++++++++++++++++++++++++ qapi/block-core.json | 34 +++++++++++++++++++++++++++++ qmp-commands.hx | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) diff --git a/blockdev.c b/blockdev.c index 32b04b4..8da0ffb 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3086,6 +3086,54 @@ fail: qmp_output_visitor_cleanup(ov); } +void qmp_x_blockdev_child_add(const char *parent, const char *child, + Error **errp) +{ + BlockDriverState *parent_bs, *child_bs; + Error *local_err = NULL; + + parent_bs = bdrv_lookup_bs(parent, parent, &local_err); + if (!parent_bs) { + error_propagate(errp, local_err); + return; + } + + child_bs = bdrv_find_node(child); + if (!child_bs) { + error_setg(errp, "Node '%s' not found", child); + return; + } + + bdrv_add_child(parent_bs, child_bs, &local_err); + if (local_err) { + error_propagate(errp, local_err); + } +} + +void qmp_x_blockdev_child_del(const char *parent, const char *child, + Error **errp) +{ + BlockDriverState *parent_bs, *child_bs; + Error *local_err = NULL; + + parent_bs = bdrv_lookup_bs(parent, parent, &local_err); + if (!parent_bs) { + error_propagate(errp, local_err); + return; + } + + child_bs = bdrv_find_node(child); + if (!child_bs) { + error_setg(errp, "Node '%s' not found", child); + return; + } + + bdrv_del_child(parent_bs, child_bs, &local_err); + if (local_err) { + error_propagate(errp, local_err); + } +} + BlockJobInfoList *qmp_query_block_jobs(Error **errp) { BlockJobInfoList *head = NULL, **p_next = &head; diff --git a/qapi/block-core.json b/qapi/block-core.json index bb2189e..9418f05 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2114,3 +2114,37 @@ ## { 'command': 'block-set-write-threshold', 'data': { 'node-name': 'str', 'write-threshold': 'uint64' } } + +## +# @x-blockdev-child-add +# +# Add a new child to the parent BDS. Currently only the Quorum driver +# implements this feature. This is useful to fix a broken quorum child. +# +# @parent: graph node name or id which the child will be added to. +# +# @child: graph node name that will be added. +# +# Note: this command is experimental, and not a stable API. +# +# Since: 2.5 +## +{ 'command': 'x-blockdev-child-add', + 'data' : { 'parent': 'str', 'child': 'str' } } + +## +# @x-blockdev-child-del +# +# Remove a child from the parent BDS. Currently only the Quorum driver +# implements this feature. This is useful to fix a broken quorum child. +# Note, you can't remove a child if it would bring the quorum below its +# threshold. +# +# @parent: graph node name or id from which the child will removed. +# +# @child: graph node name that will be removed. +# +# Since: 2.5 +## +{ 'command': 'x-blockdev-child-del', + 'data' : { 'parent': 'str', 'child': 'str' } } diff --git a/qmp-commands.hx b/qmp-commands.hx index 66f0300..36e75b1 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3916,6 +3916,67 @@ Example (2): EQMP { + .name = "x-blockdev-child-add", + .args_type = "parent:B,child:B", + .mhandler.cmd_new = qmp_marshal_x_blockdev_child_add, + }, + +SQMP +x-blockdev-child-add +------------ + +Add a child to a quorum node. + +Arguments: + +- "parent": the quorum's id or node name +- "child": the child node-name which will be added + +Note: this command is experimental, and not a stable API. It doesn't +support all kinds of children, nor all block drivers. + +Example: + +-> { "execute": blockdev-add", + "arguments": { "options": { "driver": "raw", + "node-name": "new_node", + "id": "test_new_node", + "file": { "driver": "file", + "filename": "test.raw" } } } } +<- { "return": {} } +-> { "execute": "x-blockdev-child-add", + "arguments": { "parent": "disk1", "child": "new_node" } } +<- { "return": {} } + +EQMP + + { + .name = "x-blockdev-child-del", + .args_type = "parent:B,child:B", + .mhandler.cmd_new = qmp_marshal_x_blockdev_child_del, + }, + +SQMP +x-blockdev-child-del +------------ + +Delete a child from a quorum node. It can be used to remove a broken +quorum child. + +Arguments: + +- "parent": the quorum's id or node name +- "child": the child node-name which will be removed + +Example: + +-> { "execute": "x-blockdev-child-del", + "arguments": { "parent": "disk1", "child": "new_node" } } +<- { "return": {} } + +EQMP + + { .name = "query-named-block-nodes", .args_type = "", .mhandler.cmd_new = qmp_marshal_query_named_block_nodes, -- 2.4.3