On 25.02.2017 18:07, Vladimir Sementsov-Ogievskiy wrote:
> Realize .bdrv_can_store_new_dirty_bitmap interface.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
> Reviewed-by: John Snow <js...@redhat.com>
> ---
> block/qcow2-bitmap.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
> block/qcow2.c | 2 ++
> block/qcow2.h | 4 ++++
> 3 files changed, 57 insertions(+)
>
> diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
> index e377215d5c..8c0c24c208 100644
> --- a/block/qcow2-bitmap.c
> +++ b/block/qcow2-bitmap.c
> @@ -1280,3 +1280,54 @@ fail:
>
> bitmap_list_free(bm_list);
> }
> +
> +bool qcow2_can_store_new_dirty_bitmap(BlockDriverState *bs,
> + const char *name,
> + uint32_t granularity,
> + Error **errp)
> +{
> + BDRVQcow2State *s = bs->opaque;
> + bool found;
> + Qcow2BitmapList *bm_list;
> +
> + if (check_constraints_on_bitmap(bs, name, granularity, errp) != 0) {
> + goto fail;
> + }
> +
> + if (s->nb_bitmaps == 0) {
> + return true;
> + }
> +
> + if (s->nb_bitmaps >= QCOW2_MAX_BITMAPS) {
> + error_setg(errp,
> + "Maximum number of persistent bitmaps is already
> reached");
> + goto fail;
> + }
> +
> + if (s->bitmap_directory_size + calc_dir_entry_size(strlen(name), 0) >
> + QCOW2_MAX_BITMAP_DIRECTORY_SIZE)
> + {
> + error_setg(errp, "No enough space in the bitmap directory");
*Not
With that fixed:
Reviewed-by: Max Reitz <mre...@redhat.com>
> + goto fail;
> + }
> +
> + bm_list = bitmap_list_load(bs, s->bitmap_directory_offset,
> + s->bitmap_directory_size, errp);
> + if (bm_list == NULL) {
> + goto fail;
> + }
> +
> + found = find_bitmap_by_name(bm_list, name);
> + bitmap_list_free(bm_list);
> + if (found) {
> + error_setg(errp, "Bitmap with the same name is already stored");
> + goto fail;
> + }
> +
> + return true;
> +
> +fail:
> + error_prepend(errp, "Can't make bitmap '%s' persistent in '%s': ",
> + name, bdrv_get_device_or_node_name(bs));
> + return false;
> +}
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 201e7186f0..8f7937dc50 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -3555,6 +3555,8 @@ BlockDriver bdrv_qcow2 = {
>
> .bdrv_detach_aio_context = qcow2_detach_aio_context,
> .bdrv_attach_aio_context = qcow2_attach_aio_context,
> +
> + .bdrv_can_store_new_dirty_bitmap = qcow2_can_store_new_dirty_bitmap,
> };
>
> static void bdrv_qcow2_init(void)
> diff --git a/block/qcow2.h b/block/qcow2.h
> index e2ef5698cd..c291858425 100644
> --- a/block/qcow2.h
> +++ b/block/qcow2.h
> @@ -622,5 +622,9 @@ int qcow2_check_bitmaps_refcounts(BlockDriverState *bs,
> BdrvCheckResult *res,
> int64_t *refcount_table_size);
> void qcow2_load_autoloading_dirty_bitmaps(BlockDriverState *bs, Error
> **errp);
> void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error
> **errp);
> +bool qcow2_can_store_new_dirty_bitmap(BlockDriverState *bs,
> + const char *name,
> + uint32_t granularity,
> + Error **errp);
>
> #endif
>
signature.asc
Description: OpenPGP digital signature
