From patchwork Tue Sep 22 07:44:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 520849 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7DEEF14012C for ; Tue, 22 Sep 2015 17:46:43 +1000 (AEST) Received: from localhost ([::1]:37404 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeIHh-0007fq-Dp for incoming@patchwork.ozlabs.org; Tue, 22 Sep 2015 03:46:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeIGG-0005l6-At for qemu-devel@nongnu.org; Tue, 22 Sep 2015 03:45:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZeIGF-0003Cp-CB for qemu-devel@nongnu.org; Tue, 22 Sep 2015 03:45:12 -0400 Received: from [59.151.112.132] (port=36638 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeIGE-0002wA-Uj; Tue, 22 Sep 2015 03:45:11 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="100968691" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 22 Sep 2015 15:47:47 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t8M7igKg011263; Tue, 22 Sep 2015 15:44:42 +0800 Received: from G08FNSTD140052.g08.fujitsu.local (10.167.226.52) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Tue, 22 Sep 2015 15:45:00 +0800 From: Wen Congyang To: qemu devel , Eric Blake , Markus Armbruster , Alberto Garcia , Stefan Hajnoczi Date: Tue, 22 Sep 2015 15:44:22 +0800 Message-ID: <1442907862-21376-5-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 2.4.3 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 X-Originating-IP: [10.167.226.52] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Kevin Wolf , qemu block , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , Luiz Capitulino , Gonglei , Yang Hongyang , zhanghailiang Subject: [Qemu-devel] [PATCH v5 4/4] hmp: add monitor command to add/remove a child X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The new command is blockdev_child_add and blockdev_child_del. It does the same thing as the QMP command x-blockdev-child-add and x-blockdev-child-del. Signed-off-by: Wen Congyang Signed-off-by: zhanghailiang Signed-off-by: Gonglei Cc: Luiz Capitulino --- hmp-commands.hx | 28 ++++++++++++++++++++++++++++ hmp.c | 20 ++++++++++++++++++++ hmp.h | 2 ++ 3 files changed, 50 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index a511004..57adb7d 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -193,6 +193,34 @@ actions (drive options rerror, werror). ETEXI { + .name = "blockdev_child_add", + .args_type = "id:B,child:B", + .params = "parent child", + .help = "add a child to a BDS", + .mhandler.cmd = hmp_blockdev_child_add, + }, + +STEXI +@item blockdev_child_add @var{parent} @var{child} +@findex blockdev_child_add +Add a child to the block device. +ETEXI + + { + .name = "blockdev_child_del", + .args_type = "id:B,child:B", + .params = "parent child", + .help = "remove a child from a BDS", + .mhandler.cmd = hmp_blockdev_child_del, + }, + +STEXI +@item blockdev_child_del @var{parent} @var{child} +@findex blockdev_child_del +Remove a child from the parent device. +ETEXI + + { .name = "change", .args_type = "device:B,target:F,arg:s?", .params = "device filename [format]", diff --git a/hmp.c b/hmp.c index 3f807b7..1dc1bed 100644 --- a/hmp.c +++ b/hmp.c @@ -2325,3 +2325,23 @@ void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict) qapi_free_RockerOfDpaGroupList(list); } + +void hmp_blockdev_child_add(Monitor *mon, const QDict *qdict) +{ + const char *id = qdict_get_str(qdict, "id"); + const char *child_id = qdict_get_str(qdict, "child"); + Error *local_err = NULL; + + qmp_x_blockdev_child_add(id, child_id, &local_err); + hmp_handle_error(mon, &local_err); +} + +void hmp_blockdev_child_del(Monitor *mon, const QDict *qdict) +{ + const char *id = qdict_get_str(qdict, "id"); + const char *child_id = qdict_get_str(qdict, "child"); + Error *local_err = NULL; + + qmp_x_blockdev_child_del(id, child_id, &local_err); + hmp_handle_error(mon, &local_err); +} diff --git a/hmp.h b/hmp.h index 81656c3..3033648 100644 --- a/hmp.h +++ b/hmp.h @@ -130,5 +130,7 @@ void hmp_rocker(Monitor *mon, const QDict *qdict); void hmp_rocker_ports(Monitor *mon, const QDict *qdict); void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict); void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict); +void hmp_blockdev_child_add(Monitor *mon, const QDict *qdict); +void hmp_blockdev_child_del(Monitor *mon, const QDict *qdict); #endif