diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2017-06-28 15:05:24 +0300 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2017-07-11 17:44:59 +0200 |
| commit | eb738bb50f216db5edbbf0a59c488cd685ef9e61 (patch) | |
| tree | 15e898e2b974d0b0a94a86a4b25b89560006144a | |
| parent | fd5ae4ccbea17971e4202bbdaba4501627b15f70 (diff) | |
| download | focaccia-qemu-eb738bb50f216db5edbbf0a59c488cd685ef9e61.tar.gz focaccia-qemu-eb738bb50f216db5edbbf0a59c488cd685ef9e61.zip | |
qmp: add autoload parameter to block-dirty-bitmap-add
Optional. Default is false. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Signed-off-by: Denis V. Lunev <den@openvz.org> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Message-id: 20170628120530.31251-25-vsementsov@virtuozzo.com Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | blockdev.c | 18 | ||||
| -rw-r--r-- | qapi/block-core.json | 6 |
2 files changed, 21 insertions, 3 deletions
diff --git a/blockdev.c b/blockdev.c index 2ef731b1f7..b7c1449146 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1984,6 +1984,7 @@ static void block_dirty_bitmap_add_prepare(BlkActionState *common, qmp_block_dirty_bitmap_add(action->node, action->name, action->has_granularity, action->granularity, action->has_persistent, action->persistent, + action->has_autoload, action->autoload, &local_err); if (!local_err) { @@ -2710,6 +2711,7 @@ out: void qmp_block_dirty_bitmap_add(const char *node, const char *name, bool has_granularity, uint32_t granularity, bool has_persistent, bool persistent, + bool has_autoload, bool autoload, Error **errp) { BlockDriverState *bs; @@ -2739,6 +2741,15 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, if (!has_persistent) { persistent = false; } + if (!has_autoload) { + autoload = false; + } + + if (has_autoload && !persistent) { + error_setg(errp, "Autoload flag must be used only for persistent " + "bitmaps"); + return; + } if (persistent && !bdrv_can_store_new_dirty_bitmap(bs, name, granularity, errp)) @@ -2747,9 +2758,12 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, } bitmap = bdrv_create_dirty_bitmap(bs, granularity, name, errp); - if (bitmap != NULL) { - bdrv_dirty_bitmap_set_persistance(bitmap, persistent); + if (bitmap == NULL) { + return; } + + bdrv_dirty_bitmap_set_persistance(bitmap, persistent); + bdrv_dirty_bitmap_set_autoload(bitmap, autoload); } void qmp_block_dirty_bitmap_remove(const char *node, const char *name, diff --git a/qapi/block-core.json b/qapi/block-core.json index 907ac9d7eb..fb69efef81 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1558,11 +1558,15 @@ # Qcow2 disks support persistent bitmaps. Default is false for # block-dirty-bitmap-add. (Since: 2.10) # +# @autoload: the bitmap will be automatically loaded when the image it is stored +# in is opened. This flag may only be specified for persistent +# bitmaps. Default is false for block-dirty-bitmap-add. (Since: 2.10) +# # Since: 2.4 ## { 'struct': 'BlockDirtyBitmapAdd', 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32', - '*persistent': 'bool' } } + '*persistent': 'bool', '*autoload': 'bool' } } ## # @block-dirty-bitmap-add: |