Message ID | 1487153430-17260-17-git-send-email-vsementsov@virtuozzo.com |
---|---|
State | New |
Headers | show |
On 02/15/2017 05:10 AM, Vladimir Sementsov-Ogievskiy wrote: > Add optional 'persistent' flag to qmp command block-dirty-bitmap-add. > 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> > --- > blockdev.c | 18 +++++++++++++++++- > qapi/block-core.json | 8 +++++++- > 2 files changed, 24 insertions(+), 2 deletions(-) > > diff --git a/blockdev.c b/blockdev.c > index 245e1e1..40605fa 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -1967,6 +1967,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) { > @@ -2696,10 +2697,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"); > @@ -2725,7 +2728,20 @@ 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; > + } > + > + if (persistent && > + !bdrv_can_store_new_dirty_bitmap(bs, name, granularity, errp)) > + { > + goto out; > + } > + > + 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 932f5bb..535df20 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -1559,10 +1559,16 @@ > # @granularity: #optional the bitmap granularity, default is 64k for > # block-dirty-bitmap-add > # > +# @persistent: #optional the bitmap is persistent, i.e. it will be saved to the > +# corresponding block device image file on its close. For now only > +# Qcow2 disks support persistent bitmaps. Default is false. > +# (Since 2.9) > +# > # 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/blockdev.c b/blockdev.c index 245e1e1..40605fa 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1967,6 +1967,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) { @@ -2696,10 +2697,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"); @@ -2725,7 +2728,20 @@ 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; + } + + if (persistent && + !bdrv_can_store_new_dirty_bitmap(bs, name, granularity, errp)) + { + goto out; + } + + 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 932f5bb..535df20 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1559,10 +1559,16 @@ # @granularity: #optional the bitmap granularity, default is 64k for # block-dirty-bitmap-add # +# @persistent: #optional the bitmap is persistent, i.e. it will be saved to the +# corresponding block device image file on its close. For now only +# Qcow2 disks support persistent bitmaps. Default is false. +# (Since 2.9) +# # 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: