From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6QwG-0002W3-UI for qemu-devel@nongnu.org; Thu, 23 Jan 2014 15:31:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6QwB-0004nn-Oh for qemu-devel@nongnu.org; Thu, 23 Jan 2014 15:31:48 -0500 Received: from paradis.irqsave.net ([62.212.105.220]:48172) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6QwA-0004n5-F8 for qemu-devel@nongnu.org; Thu, 23 Jan 2014 15:31:43 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Thu, 23 Jan 2014 21:31:35 +0100 Message-Id: <1390509099-695-5-git-send-email-benoit.canet@irqsave.net> In-Reply-To: <1390509099-695-1-git-send-email-benoit.canet@irqsave.net> References: <1390509099-695-1-git-send-email-benoit.canet@irqsave.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH V6 4/8] qmp: Allow to change password on named block driver states. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com From: Beno=C3=AEt Canet Signed-off-by: Benoit Canet Reviewed-by: Fam Zheng There was two candidate ways to implement named node manipulation: 1) { 'command': 'block_passwd', 'data': {'*device': 'str', '*node-name': 'str', 'password': 's= tr'} } 2) { 'command': 'block_passwd', 'data': {'device': 'str', '*device-is-node': 'bool', 'password': 'str'} } Luiz proposed 1 and says 2 was an abuse of the QMP interface and proposed= to rewrite the QMP block interface for 2.0. Luiz does not like in 1 the fact that 2 fields are optional but one of th= em must be specified leading to an abuse of the QMP semantic. Kevin argumented that 2 what a clear abuse of the device field and would = not be practical when reading fast some log file because the user would read "de= vice" and think that a device is manipulated when it's in fact a node name. Documentation of 1 make it pretty clear what to do for the user. Kevin argued that all bs are node including devices ones so 2 does not ma= ke sense. Kevin also argued that rewriting the QMP block interface would not make d= isapear the current one. Kevin pushed the argument that making the QAPI generator compatible with = the semantic of the operation would need a rewrite that no one has done yet. A vote has been done on the list to elect the version to use and 1 won. For reference the complete thread is: "[Qemu-devel] [PATCH V4 4/7] qmp: Allow to change password on names block= driver states." Signed-off-by: Benoit Canet --- block.c | 32 ++++++++++++++++++++++++++++++++ blockdev.c | 13 +++++++++---- hmp.c | 2 +- include/block/block.h | 3 +++ qapi-schema.json | 9 +++++++-- qmp-commands.hx | 3 ++- 6 files changed, 54 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index 9e45755..e1bc732 100644 --- a/block.c +++ b/block.c @@ -3303,6 +3303,38 @@ BlockDeviceInfoList *bdrv_named_nodes_list(void) return list; } =20 +BlockDriverState *bdrv_lookup_bs(const char *device, + const char *node_name, + Error **errp) +{ + BlockDriverState *bs =3D NULL; + + if ((!device && !node_name) || (device && node_name)) { + error_setg(errp, "Use either device or node-name but not both"); + return NULL; + } + + if (device) { + bs =3D bdrv_find(device); + + if (!bs) { + error_set(errp, QERR_DEVICE_NOT_FOUND, device); + return NULL; + } + + return bs; + } + + bs =3D 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 130fc14..3c27911 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1488,14 +1488,19 @@ void qmp_eject(const char *device, bool has_force= , bool force, Error **errp) eject_device(bs, force, errp); } =20 -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) { + Error *local_err =3D NULL; BlockDriverState *bs; int err; =20 - bs =3D bdrv_find(device); - if (!bs) { - error_set(errp, QERR_DEVICE_NOT_FOUND, device); + bs =3D bdrv_lookup_bs(has_device ? device : NULL, + has_node_name ? node_name : NULL, + &local_err); + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); return; } =20 diff --git a/hmp.c b/hmp.c index 468f97d..5804a5a 100644 --- a/hmp.c +++ b/hmp.c @@ -871,7 +871,7 @@ void hmp_block_passwd(Monitor *mon, const QDict *qdic= t) const char *password =3D qdict_get_str(qdict, "password"); Error *errp =3D NULL; =20 - qmp_block_passwd(device, password, &errp); + qmp_block_passwd(true, device, false, NULL, password, &errp); hmp_handle_error(mon, &errp); } =20 diff --git a/include/block/block.h b/include/block/block.h index 13654ed..b4a77e6 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -380,6 +380,9 @@ const char *bdrv_get_format_name(BlockDriverState *bs= ); BlockDriverState *bdrv_find(const char *name); BlockDriverState *bdrv_find_node(const char *node_name); BlockDeviceInfoList *bdrv_named_nodes_list(void); +BlockDriverState *bdrv_lookup_bs(const char *device, + 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 978632a..d7a674b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1676,7 +1676,11 @@ # determine which ones are encrypted, set the passwords with this comman= d, 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 pas= sword on +# +# @node-name: #optional graph node name to set the password on (Since 2.= 0) # # @password: the password to use for the device # @@ -1690,7 +1694,8 @@ # # Since: 0.14.0 ## -{ 'command': 'block_passwd', 'data': {'device': 'str', 'password': 'str'= } } +{ 'command': 'block_passwd', 'data': {'*device': 'str', + '*node-name': 'str', 'password': '= str'} } =20 ## # @balloon: diff --git a/qmp-commands.hx b/qmp-commands.hx index 11b44c5..5492eb0 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1503,7 +1503,7 @@ EQMP =20 { .name =3D "block_passwd", - .args_type =3D "device:B,password:s", + .args_type =3D "device:s?,node-name:s?,password:s", .mhandler.cmd_new =3D qmp_marshal_input_block_passwd, }, =20 @@ -1516,6 +1516,7 @@ Set the password of encrypted block devices. Arguments: =20 - "device": device name (json-string) +- "node-name": name in the block driver state graph (json-string) - "password": password (json-string) =20 Example: --=20 1.8.3.2