From patchwork Tue Dec 3 13:26:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 296198 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B6DEF2C00A3 for ; Wed, 4 Dec 2013 00:31:35 +1100 (EST) Received: from localhost ([::1]:42443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vnq4a-0001OC-Qb for incoming@patchwork.ozlabs.org; Tue, 03 Dec 2013 08:31:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vnq0K-0003VW-Rt for qemu-devel@nongnu.org; Tue, 03 Dec 2013 08:27:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vnq0F-0005LR-PW for qemu-devel@nongnu.org; Tue, 03 Dec 2013 08:27:08 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43054 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vnq0F-0005LA-7f for qemu-devel@nongnu.org; Tue, 03 Dec 2013 08:27:03 -0500 Received: by paradis.irqsave.net (Postfix, from userid 108) id 5AA6F3FF41; Tue, 3 Dec 2013 14:30:55 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.2]) by paradis.irqsave.net (Postfix) with ESMTP id 097543FEFA; Tue, 3 Dec 2013 14:29:59 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Tue, 3 Dec 2013 14:26:02 +0100 Message-Id: <1386077165-19577-5-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386077165-19577-1-git-send-email-benoit@irqsave.net> References: <1386077165-19577-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 62.212.105.220 Cc: kwolf@redhat.com, famz@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , jcody@redhat.com, armbru@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [RFC V3 4/7] qmp: Allow block_passwd to manipulate bs graph nodes. 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 Signed-off-by: Benoit Canet --- block.c | 33 +++++++++++++++++++++++++++++++++ blockdev.c | 13 +++++++++---- hmp.c | 2 +- include/block/block.h | 3 +++ qapi-schema.json | 9 +++++++-- qmp-commands.hx | 3 ++- 6 files changed, 55 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index 3a0cb30..8016ff2 100644 --- a/block.c +++ b/block.c @@ -3176,6 +3176,39 @@ BlockDriverState *bdrv_find_node(const char *node_name) return NULL; } +BlockDriverState * bdrv_lookup_bs(bool has_device, const char * device, + bool has_node_name, const char * node_name, + Error **errp) +{ + BlockDriverState *bs = NULL; + + if ((has_device && has_node_name) || + (!has_device && !has_node_name)) { + error_setg(errp, "Use either device or node-name but not both."); + return NULL; + } + + if (has_device) { + bs = bdrv_find(device); + + if (!bs) { + error_set(errp, QERR_DEVICE_NOT_FOUND, device); + return NULL; + } + + return bs; + } + + bs = bdrv_find_node(node_name); + + if (!bs) { + error_set(errp, QERR_DEVICE_NOT_FOUND, node_name); + return NULL; + } + + return bs; +} + BlockDriverState *bdrv_next(BlockDriverState *bs) { if (!bs) { diff --git a/blockdev.c b/blockdev.c index 824e718..aab370f 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1474,14 +1474,19 @@ void qmp_eject(const char *device, bool has_force, bool force, Error **errp) eject_device(bs, force, errp); } -void qmp_block_passwd(const char *device, const char *password, Error **errp) +void qmp_block_passwd(bool has_device, const char * device, + bool has_node_name, const char * node_name, + const char * password, Error **errp) { BlockDriverState *bs; + Error *local_err = NULL; int err; - bs = bdrv_find(device); - if (!bs) { - error_set(errp, QERR_DEVICE_NOT_FOUND, device); + bs = bdrv_lookup_bs(has_device, device, + has_node_name, node_name, + &local_err); + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); return; } diff --git a/hmp.c b/hmp.c index 32ee285..3820fbe 100644 --- a/hmp.c +++ b/hmp.c @@ -870,7 +870,7 @@ void hmp_block_passwd(Monitor *mon, const QDict *qdict) const char *password = qdict_get_str(qdict, "password"); Error *errp = NULL; - qmp_block_passwd(device, password, &errp); + qmp_block_passwd(true, device, false, NULL, password, &errp); hmp_handle_error(mon, &errp); } diff --git a/include/block/block.h b/include/block/block.h index 6426ca6..26c48e7 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -371,6 +371,9 @@ void bdrv_eject(BlockDriverState *bs, bool eject_flag); const char *bdrv_get_format_name(BlockDriverState *bs); BlockDriverState *bdrv_find(const char *name); BlockDriverState *bdrv_find_node(const char *node_name); +BlockDriverState * bdrv_lookup_bs(bool has_device, const char * device, + bool has_node_name, const char * node_name, + Error **errp); BlockDriverState *bdrv_next(BlockDriverState *bs); void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), void *opaque); diff --git a/qapi-schema.json b/qapi-schema.json index 938f8b9..60d3bd9 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1675,7 +1675,11 @@ # determine which ones are encrypted, set the passwords with this command, and # then start the guest with the @cont command. # -# @device: the name of the device to set the password on +# Either @device or @node-name must be set but not both. +# +# @device: #optional the name of the block backend device to set the password on +# +# @node-name: #optional graph node name to set the password on (Since 1.8) # # @password: the password to use for the device # @@ -1689,7 +1693,8 @@ # # Since: 0.14.0 ## -{ 'command': 'block_passwd', 'data': {'device': 'str', 'password': 'str'} } +{ 'command': 'block_passwd', 'data': {'*device': 'str', + '*node-name': 'str', 'password': 'str'} } ## # @balloon: diff --git a/qmp-commands.hx b/qmp-commands.hx index fba15cd..a73b08f 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1452,7 +1452,7 @@ EQMP { .name = "block_passwd", - .args_type = "device:B,password:s", + .args_type = "device:s?,node-name:s?,password:s", .mhandler.cmd_new = qmp_marshal_input_block_passwd, }, @@ -1465,6 +1465,7 @@ Set the password of encrypted block devices. Arguments: - "device": device name (json-string) +- "node-name": name in the block driver state graph (json-string) - "password": password (json-string) Example: