On Thu, 12/12 16:33, Benoît Canet wrote:
> Signed-off-by: Benoit Canet <ben...@irqsave.net>
> ---
> 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 ebb8f48..374d03d 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -1676,14 +1676,24 @@ int do_drive_del(Monitor *mon, const QDict *qdict,
> QObject **ret_data)
> return 0;
> }
>
> -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 = NULL;
> BlockDriverState *bs;
> int ret;
>
> - 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;
> + }
> +
> + if (!bdrv_is_first_non_filter(bs)) {
> + error_set(errp, QERR_FEATURE_DISABLED, "resize");
> return;
> }
>
> diff --git a/hmp.c b/hmp.c
> index 3820fbe..906ddb7 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -892,7 +892,7 @@ void hmp_block_resize(Monitor *mon, const QDict *qdict)
> int64_t size = qdict_get_int(qdict, "size");
> Error *errp = NULL;
>
> - qmp_block_resize(device, size, &errp);
> + qmp_block_resize(true, device, false, NULL, size, &errp);
> hmp_handle_error(mon, &errp);
> }
>
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 903fcb6..3977619 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -1722,7 +1722,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
> #
> @@ -1731,7 +1735,9 @@
> #
> # Since: 0.14.0
> ##
> -{ 'command': 'block_resize', 'data': { 'device': 'str', 'size': 'int' }}
> +{ 'command': 'block_resize', 'data': { '*device': 'str',
> + '*node-name': 'str',
> + 'size': 'int' }}
>
> ##
> # @NewImageMode
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index 1451c1a..5696b08 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -880,7 +880,7 @@ EQMP
>
> {
> .name = "block_resize",
> - .args_type = "device:B,size:o",
> + .args_type = "device:s?,node-name:s?,size:o",
> .mhandler.cmd_new = qmp_marshal_input_block_resize,
> },
>
> @@ -893,6 +893,7 @@ Resize a block image while a guest is running.
> Arguments:
>
> - "device": the device's ID, must be unique (json-string)
> +- "node-name": the node name in the block driver state graph (json-string)
> - "size": new size
>
> Example:
> --
> 1.8.3.2
>
>
Reviewed-by: Fam Zheng <f...@redhat.com>
