On Thu, 26 Jul 2012 15:18:19 +0200
benoit.ca...@gmail.com wrote:
> From: Benoît Canet <ben...@irqsave.net>
>
> Use the dedicated counting function in qmp_query_block in order to
> propagate the backing file depth to HMP.
>
> Signed-off-by: Benoit Canet <ben...@irqsave.net>
> ---
> block.c | 3 +++
> qapi-schema.json | 9 ++++++---
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/block.c b/block.c
> index 22ebe49..a6fba1d 100644
> --- a/block.c
> +++ b/block.c
> @@ -2450,6 +2450,9 @@ BlockInfoList *qmp_query_block(Error **errp)
> info->value->inserted->backing_file =
> g_strdup(bs->backing_file);
> }
>
> + info->value->inserted->backing_file_depth =
> + bdrv_get_backing_file_depth(bs);
> +
> if (bs->io_limits_enabled) {
> info->value->inserted->bps =
> bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL];
> diff --git a/qapi-schema.json b/qapi-schema.json
> index a92adb1..2b50f22 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -398,6 +398,8 @@
> #
> # @backing_file: #optional the name of the backing file (for copy-on-write)
> #
> +# @backing_file_depth: number of files in the backing file chain (since: 1.2)
> +#
> # @encrypted: true if the backing device is encrypted
> #
> # @bps: total throughput limit in bytes per second is specified
> @@ -418,9 +420,10 @@
> ##
> { 'type': 'BlockDeviceInfo',
> 'data': { 'file': 'str', 'ro': 'bool', 'drv': 'str',
> - '*backing_file': 'str', 'encrypted': 'bool',
> - 'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int',
> - 'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int'} }
> + '*backing_file': 'str', 'backing-file-depth': 'int',
Should use underscores, ie. should be backing_file_depth.
Also, the next patch and this can be squashed together.
Otherwise series looks good to me now.
> + 'encrypted': 'bool', 'bps': 'int', 'bps_rd': 'int',
> + 'bps_wr': 'int', 'iops': 'int', 'iops_rd': 'int',
> + 'iops_wr': 'int'} }
>
> ##
> # @BlockDeviceIoStatus:
