From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53194) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6kV0-0003n9-4x for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:25:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6kUu-00080w-Ut for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:24:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35701) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6kUu-00080q-Md for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:24:52 -0500 From: Kevin Wolf Date: Fri, 24 Jan 2014 18:21:41 +0100 Message-Id: <1390584136-24703-59-git-send-email-kwolf@redhat.com> In-Reply-To: <1390584136-24703-1-git-send-email-kwolf@redhat.com> References: <1390584136-24703-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 58/93] qmp: Allow block_resize to manipulate bs graph nodes. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Beno=C3=AEt Canet Signed-off-by: Benoit Canet Reviewed-by: Fam Zheng Signed-off-by: Kevin Wolf --- blockdev.c | 18 ++++++++++++++---- hmp.c | 2 +- qapi-schema.json | 10 ++++++++-- qmp-commands.hx | 3 ++- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/blockdev.c b/blockdev.c index 32a356e..d192370 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1683,14 +1683,24 @@ int do_drive_del(Monitor *mon, const QDict *qdict= , QObject **ret_data) return 0; } =20 -void qmp_block_resize(const char *device, int64_t size, Error **errp) +void qmp_block_resize(bool has_device, const char *device, + bool has_node_name, const char *node_name, + int64_t size, Error **errp) { + Error *local_err =3D NULL; BlockDriverState *bs; int ret; =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; + } + + if (!bdrv_is_first_non_filter(bs)) { + error_set(errp, QERR_FEATURE_DISABLED, "resize"); return; } =20 diff --git a/hmp.c b/hmp.c index 5804a5a..66c8d7e 100644 --- a/hmp.c +++ b/hmp.c @@ -893,7 +893,7 @@ void hmp_block_resize(Monitor *mon, const QDict *qdic= t) int64_t size =3D qdict_get_int(qdict, "size"); Error *errp =3D NULL; =20 - qmp_block_resize(device, size, &errp); + qmp_block_resize(true, device, false, NULL, size, &errp); hmp_handle_error(mon, &errp); } =20 diff --git a/qapi-schema.json b/qapi-schema.json index 3f48ae9..f21243a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1724,7 +1724,11 @@ # # Resize a block image while a guest is running. # -# @device: the name of the device to get the image resized +# Either @device or @node-name must be set but not both. +# +# @device: #optional the name of the device to get the image resized +# +# @node-name: #optional graph node name to get the image resized (Since = 2.0) # # @size: new image size in bytes # @@ -1733,7 +1737,9 @@ # # Since: 0.14.0 ## -{ 'command': 'block_resize', 'data': { 'device': 'str', 'size': 'int' }} +{ 'command': 'block_resize', 'data': { '*device': 'str', + '*node-name': 'str', + 'size': 'int' }} =20 ## # @NewImageMode diff --git a/qmp-commands.hx b/qmp-commands.hx index 5492eb0..a45f26c 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -931,7 +931,7 @@ EQMP =20 { .name =3D "block_resize", - .args_type =3D "device:B,size:o", + .args_type =3D "device:s?,node-name:s?,size:o", .mhandler.cmd_new =3D qmp_marshal_input_block_resize, }, =20 @@ -944,6 +944,7 @@ Resize a block image while a guest is running. Arguments: =20 - "device": the device's ID, must be unique (json-string) +- "node-name": the node name in the block driver state graph (json-strin= g) - "size": new size =20 Example: --=20 1.8.1.4