Re: [Qemu-devel] [RFC PATCH 09/16] qmp: Add block-dirty-bitmap-set-persistent

[John Snow]

On 01/26/2016 05:38 AM, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <address@hidden>
> ---
>  blockdev.c           | 20 ++++++++++++++++++++
>  qapi/block-core.json | 22 ++++++++++++++++++++++
>  qmp-commands.hx      | 31 +++++++++++++++++++++++++++++++
>  3 files changed, 73 insertions(+)
> 
> diff --git a/blockdev.c b/blockdev.c
> index 08236f2..a9d6617 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -2699,6 +2699,9 @@ void qmp_block_dirty_bitmap_remove(const char *node, 
> const char *name,
>                     name);
>          goto out;
>      }
> +    if (bdrv_dirty_bitmap_set_persistent(bs, bitmap, false, false, errp)) {
> +        goto out;
> +    }

Does this belong in Patch #6?

>      bdrv_dirty_bitmap_make_anon(bitmap);
>      bdrv_release_dirty_bitmap(bs, bitmap);
>  
> @@ -2740,6 +2743,23 @@ void qmp_block_dirty_bitmap_clear(const char *node, 
> const char *name,
>      aio_context_release(aio_context);
>  }
>  
> +void qmp_block_dirty_bitmap_set_persistent(const char *node, const char 
> *name,
> +                                           bool persistent, Error **errp)
> +{
> +    AioContext *aio_context;
> +    BdrvDirtyBitmap *bitmap;
> +    BlockDriverState *bs;
> +
> +    bitmap = block_dirty_bitmap_lookup(node, name, &bs, &aio_context, errp);
> +    if (!bitmap || !bs) {
> +        return;
> +    }
> +
> +    bdrv_dirty_bitmap_set_persistent(bs, bitmap, persistent, false, errp);
> +
> +    aio_context_release(aio_context);
> +}
> +
>  void hmp_drive_del(Monitor *mon, const QDict *qdict)
>  {
>      const char *id = qdict_get_str(qdict, "id");
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index 0ac107c..52689ed 100644
> --- a/qapi/block-core.json
> +++ b/qapi/block-core.json
> @@ -1263,6 +1263,28 @@
>              '*on-target-error': 'BlockdevOnError' } }
>  
>  ##
> +# @block-dirty-bitmap-set-persistent
> +#
> +# Update a dirty bitmap's persistent state on the device
> +#
> +# @node: name of device/node which the bitmap is tracking
> +#
> +# @name: name of the dirty bitmap
> +#
> +# @persistent: #optinal whether to make the bitmap persistent, default is 
> false
> +#

optional :)

> +# Returns: nothing on success
> +#          If @node is not a valid block device, DeviceNotFound
> +#          If @name is not found, GenericError with an explanation
> +#          If an error happens when setting the persistent state, 
> GenericError
> +#          with an explanation
> +#
> +# Since 2.6
> +##
> +{ 'command': 'block-dirty-bitmap-set-persistent',
> +  'data': { 'node': 'str', 'name': 'str', 'persistent': 'bool' } }
> +
> +##
>  # @block_set_io_throttle:
>  #
>  # Change I/O throttle limits for a block drive.
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index bd4428e..e37cf09 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -1458,6 +1458,37 @@ Example:
>  EQMP
>  
>      {
> +        .name       = "block-dirty-bitmap-set-persistent",
> +        .args_type  = "node:B,name:s,persistent:b",
> +        .mhandler.cmd_new = qmp_marshal_block_dirty_bitmap_set_persistent,
> +    },
> +
> +SQMP
> +
> +block-dirty-bitmap-set-persistent
> +---------------------------------
> +Since 2.6
> +
> +Update the persistent state of a dirty bitmap. Format driver support is
> +required.
> +

TODO: Mention supported drivers, perhaps. I know as of right now that's
none, but just a reminder.

> +Arguments:
> +
> +- "node": device/node on which to update the dirty bitmap (json-string)
> +- "name": name of the dirty bitmap to update (json-string)
> +- "persistent": the state to update to. (json-bool)
> +
> +Example:
> +
> +-> { "execute": "block-dirty-bitmap-set-persistent",
> +                "arguments": { "node": "drive0",
> +                               "name": "bitmap0",
> +                               "persistent": true } }
> +<- { "return": {} }
> +
> +EQMP
> +
> +    {
>          .name       = "blockdev-snapshot-sync",
>          .args_type  = 
> "device:s?,node-name:s?,snapshot-file:s,snapshot-node-name:s?,format:s?,mode:s?",
>          .mhandler.cmd_new = qmp_marshal_blockdev_snapshot_sync,
> 

Looks good.