Message ID | 1479835586-74394-18-git-send-email-vsementsov@virtuozzo.com |
---|---|
State | New |
Headers | show |
On 22.11.2016 18:26, Vladimir Sementsov-Ogievskiy wrote: > Optional. Default is false. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > Signed-off-by: Denis V. Lunev <den@openvz.org> > --- > blockdev.c | 18 ++++++++++++++++-- > docs/qmp-commands.txt | 4 ++++ > qapi/block-core.json | 6 +++++- > 3 files changed, 25 insertions(+), 3 deletions(-) > > diff --git a/blockdev.c b/blockdev.c > index 3876d1d..3891d86 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -1968,6 +1968,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) { > @@ -2698,6 +2699,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) > { > AioContext *aio_context; > @@ -2731,6 +2733,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"); > + goto out; > + } > > if (persistent && > !bdrv_can_store_dirty_bitmap(bs, name, granularity, errp)) { > @@ -2738,10 +2749,13 @@ 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) { > + goto out; > } > > + bdrv_dirty_bitmap_set_persistance(bitmap, persistent); > + bdrv_dirty_bitmap_set_autoload(bitmap, autoload); > + > out: > aio_context_release(aio_context); > } > diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt > index c4ad1e4..dda2911 100644 > --- a/docs/qmp-commands.txt > +++ b/docs/qmp-commands.txt > @@ -1018,6 +1018,10 @@ Arguments: > - "persistent": bitmap will be saved to the corresponding block device image > file on its close. For now only Qcow2 disks support persistent > bitmaps. (json-bool, optional, default false) (Since 2.8) > +- "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 (json-bool, optional, default false) > + (Since 2.8) *2.9 > > Example: > > diff --git a/qapi/block-core.json b/qapi/block-core.json > index cec312c..648f94a 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -1235,11 +1235,15 @@ > # corresponding block device image file on its close. Default is > # false. (Since 2.8) > # > +# @autoload: #optional 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. (Since 2.8) *2.9 With both fixed: Reviewed-by: Max Reitz <mreitz@redhat.com> > +# > # Since 2.4 > ## > { 'struct': 'BlockDirtyBitmapAdd', > 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32', > - '*persistent': 'bool' } } > + '*persistent': 'bool', '*autoload': 'bool' } } > > ## > # @block-dirty-bitmap-add >
diff --git a/blockdev.c b/blockdev.c index 3876d1d..3891d86 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1968,6 +1968,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) { @@ -2698,6 +2699,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) { AioContext *aio_context; @@ -2731,6 +2733,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"); + goto out; + } if (persistent && !bdrv_can_store_dirty_bitmap(bs, name, granularity, errp)) { @@ -2738,10 +2749,13 @@ 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) { + goto out; } + bdrv_dirty_bitmap_set_persistance(bitmap, persistent); + bdrv_dirty_bitmap_set_autoload(bitmap, autoload); + out: aio_context_release(aio_context); } diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt index c4ad1e4..dda2911 100644 --- a/docs/qmp-commands.txt +++ b/docs/qmp-commands.txt @@ -1018,6 +1018,10 @@ Arguments: - "persistent": bitmap will be saved to the corresponding block device image file on its close. For now only Qcow2 disks support persistent bitmaps. (json-bool, optional, default false) (Since 2.8) +- "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 (json-bool, optional, default false) + (Since 2.8) Example: diff --git a/qapi/block-core.json b/qapi/block-core.json index cec312c..648f94a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1235,11 +1235,15 @@ # corresponding block device image file on its close. Default is # false. (Since 2.8) # +# @autoload: #optional 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. (Since 2.8) +# # Since 2.4 ## { 'struct': 'BlockDirtyBitmapAdd', 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32', - '*persistent': 'bool' } } + '*persistent': 'bool', '*autoload': 'bool' } } ## # @block-dirty-bitmap-add