Add optional 'persistent' flag to qmp command block-dirty-bitmap-add. Default is false.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> Signed-off-by: Denis V. Lunev <d...@openvz.org> --- blockdev.c | 12 +++++++++++- qapi/block-core.json | 3 ++- qmp-commands.hx | 5 ++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/blockdev.c b/blockdev.c index eafeba9..cf5ebb9 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2031,6 +2031,7 @@ static void block_dirty_bitmap_add_prepare(BlkActionState *common, /* AIO context taken and released within qmp_block_dirty_bitmap_add */ qmp_block_dirty_bitmap_add(action->node, action->name, action->has_granularity, action->granularity, + action->has_persistent, action->persistent, &local_err); if (!local_err) { @@ -2734,10 +2735,12 @@ out: void qmp_block_dirty_bitmap_add(const char *node, const char *name, bool has_granularity, uint32_t granularity, + bool has_persistent, bool persistent, Error **errp) { AioContext *aio_context; BlockDriverState *bs; + BdrvDirtyBitmap *bitmap; if (!name || name[0] == '\0') { error_setg(errp, "Bitmap name cannot be empty"); @@ -2763,7 +2766,14 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, granularity = bdrv_get_default_bitmap_granularity(bs); } - bdrv_create_dirty_bitmap(bs, granularity, name, errp); + if (!has_persistent) { + persistent = false; + } + + bitmap = bdrv_create_dirty_bitmap(bs, granularity, name, errp); + if (bitmap != NULL) { + bdrv_dirty_bitmap_set_persistance(bitmap, persistent); + } out: aio_context_release(aio_context); diff --git a/qapi/block-core.json b/qapi/block-core.json index 2bbc027..73c1aaf 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1224,7 +1224,8 @@ # Since 2.4 ## { 'struct': 'BlockDirtyBitmapAdd', - 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32' } } + 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32', + '*persistent': 'bool' } } ## # @block-dirty-bitmap-add diff --git a/qmp-commands.hx b/qmp-commands.hx index c8d360a..f7d75bb 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1435,7 +1435,7 @@ EQMP { .name = "block-dirty-bitmap-add", - .args_type = "node:B,name:s,granularity:i?", + .args_type = "node:B,name:s,granularity:i?,persistent:b?", .mhandler.cmd_new = qmp_marshal_block_dirty_bitmap_add, }, @@ -1452,6 +1452,9 @@ Arguments: - "node": device/node on which to create dirty bitmap (json-string) - "name": name of the new dirty bitmap (json-string) - "granularity": granularity to track writes with (int, optional) +- "persistent": bitmap will be saved to corresponding block device + on quit. Block driver should maintain persistent bitmaps + (json-bool, optional, default false) Example: -- 1.8.3.1