On Mon, Mar 02, 2015 at 06:19:57PM -0500, John Snow wrote:
> Adds the "disabled" and "frozen" status booleans.
>
> Signed-off-by: Fam Zheng <f...@redhat.com>
> Signed-off-by: John Snow <js...@redhat.com>
> Reviewed-by: Max Reitz <mre...@redhat.com>
> ---
> block.c | 2 ++
> qapi/block-core.json | 7 ++++++-
> 2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/block.c b/block.c
> index d969b24..06b4264 100644
> --- a/block.c
> +++ b/block.c
> @@ -5602,6 +5602,8 @@ BlockDirtyInfoList
> *bdrv_query_dirty_bitmaps(BlockDriverState *bs)
> info->granularity = bdrv_dirty_bitmap_granularity(bm);
> info->has_name = !!bm->name;
> info->name = g_strdup(bm->name);
> + info->disabled = bm->disabled;
> + info->frozen = bdrv_dirty_bitmap_frozen(bm);
> entry->value = info;
> *plist = entry;
> plist = &entry->next;
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index 50970c4..7e4e14b 100644
> --- a/qapi/block-core.json
> +++ b/qapi/block-core.json
> @@ -335,10 +335,15 @@
> #
> # @granularity: granularity of the dirty bitmap in bytes (since 1.4)
> #
> +# @disabled: whether the dirty bitmap is disabled (Since 2.4)
> +#
> +# @frozen: whether the dirty bitmap is frozen (Since 2.4)
> +#
> # Since: 1.3
> ##
> { 'type': 'BlockDirtyInfo',
> - 'data': {'*name': 'str', 'count': 'int', 'granularity': 'uint32'} }
> + 'data': {'*name': 'str', 'count': 'int', 'granularity': 'uint32',
> + 'disabled': 'bool', 'frozen': 'bool'} }frozen is useful information because the bitmap cannot be deleted while frozen. I'm not sure disabled is needed since it is not used separately from frozen in this patch series. Please add it later, when disabled is actually needed. Stefan
pgpyXJzr380Cb.pgp
Description: PGP signature
