motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-30 13:31:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: add disabled parameter to block-dirty-bitmap-add

Browse source 
This is needed, for example, to create a new bitmap and merge several
disabled bitmaps into a new one. Without this flag we will have to
put block-dirty-bitmap-add and block-dirty-bitmap-disable into one
transaction.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 20180606182449.1607-6-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2018-06-11 14:53:32 -04:00 • committed by John Snow
parent b598e531f1
commit a6e2ca5f65
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
blockdev.c
View file

@ -2073,6 +2073,7 @@ static void block_dirty_bitmap_add_prepare(BlkActionState *common,
action->has_granularity, action->granularity, action->has_granularity, action->granularity,
action->has_persistent, action->persistent, action->has_persistent, action->persistent,
action->has_autoload, action->autoload, action->has_autoload, action->autoload,
action->has_x_disabled, action->x_disabled,
&local_err); &local_err);
if (!local_err) { if (!local_err) {
@ -2880,6 +2881,7 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name,
bool has_granularity, uint32_t granularity, bool has_granularity, uint32_t granularity,
bool has_persistent, bool persistent, bool has_persistent, bool persistent,
bool has_autoload, bool autoload, bool has_autoload, bool autoload,
bool has_disabled, bool disabled,
Error **errp) Error **errp)
{ {
BlockDriverState *bs; BlockDriverState *bs;
@ -2914,6 +2916,10 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name,
warn_report("Autoload option is deprecated and its value is ignored"); warn_report("Autoload option is deprecated and its value is ignored");
} }
if (!has_disabled) {
disabled = false;
}
if (persistent && if (persistent &&
!bdrv_can_store_new_dirty_bitmap(bs, name, granularity, errp)) !bdrv_can_store_new_dirty_bitmap(bs, name, granularity, errp))
{ {
@ -2925,6 +2931,10 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name,
return; return;
} }
if (disabled) {
bdrv_disable_dirty_bitmap(bitmap);
}
bdrv_dirty_bitmap_set_persistance(bitmap, persistent); bdrv_dirty_bitmap_set_persistance(bitmap, persistent);
} }

6
qapi/block-core.json
View file

@ -1734,11 +1734,15 @@
# Currently, all dirty tracking bitmaps are loaded from Qcow2 on # Currently, all dirty tracking bitmaps are loaded from Qcow2 on
# open. # open.
# #
# @x-disabled: the bitmap is created in the disabled state, which means that
# it will not track drive changes. The bitmap may be enabled with
# x-block-dirty-bitmap-enable. Default is false. (Since: 3.0)
#
# Since: 2.4 # Since: 2.4
## ##
{ 'struct': 'BlockDirtyBitmapAdd', { 'struct': 'BlockDirtyBitmapAdd',
'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32', 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32',
'*persistent': 'bool', '*autoload': 'bool' } } '*persistent': 'bool', '*autoload': 'bool', '*x-disabled': 'bool' } }
## ##
# @BlockDirtyBitmapMerge: # @BlockDirtyBitmapMerge: