[Qemu-devel] [PATCH 09/17] qcow2-dirty-bitmap: add qcow2_dirty_bitmap_load_check()

[Vladimir Sementsov-Ogievskiy]

The function checks existing of the bitmap without loading it.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
 block.c                    | 15 +++++++++++++++
 block/qcow2-dirty-bitmap.c |  5 +++++
 block/qcow2.c              |  1 +
 block/qcow2.h              |  1 +
 include/block/block.h      |  2 ++
 include/block/block_int.h  |  2 ++
 6 files changed, 26 insertions(+)

diff --git a/block.c b/block.c
index 8c39d0a..69d7c30 100644
--- a/block.c
+++ b/block.c
@@ -3347,6 +3347,21 @@ void bdrv_release_meta_bitmap(BdrvDirtyBitmap *bitmap)
     }
 }
 
+bool bdrv_load_check_dirty_bitmap(BlockDriverState *file, const char *name)
+{
+    BlockDriver *drv = file->drv;
+    if (!drv) {
+        return false;
+    }
+    if (drv->bdrv_dirty_bitmap_load_check) {
+        return drv->bdrv_dirty_bitmap_load_check(file, name);
+    }
+    if (file->file)  {
+        return bdrv_load_check_dirty_bitmap(file->file, name);
+    }
+    return false;
+}
+
 BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,
                                           uint32_t granularity,
                                           const char *name,
diff --git a/block/qcow2-dirty-bitmap.c b/block/qcow2-dirty-bitmap.c
index 39f54e4..2687edc 100644
--- a/block/qcow2-dirty-bitmap.c
+++ b/block/qcow2-dirty-bitmap.c
@@ -303,6 +303,11 @@ finish:
     return ret;
 }
 
+bool qcow2_dirty_bitmap_load_check(BlockDriverState *file, const char *name)
+{
+    return find_dirty_bitmap_by_name(file, name) != NULL;
+}
+
 BdrvDirtyBitmap * qcow2_dirty_bitmap_load(BlockDriverState *bs_for,
                                           BlockDriverState *bs_file,
                                           const char *name,
diff --git a/block/qcow2.c b/block/qcow2.c
index de638e7..36f404c 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3045,6 +3045,7 @@ BlockDriver bdrv_qcow2 = {
     .bdrv_get_specific_info = qcow2_get_specific_info,
 
     .bdrv_dirty_bitmap_load = qcow2_dirty_bitmap_load,
+    .bdrv_dirty_bitmap_load_check = qcow2_dirty_bitmap_load_check,
     .bdrv_dirty_bitmap_store = qcow2_dirty_bitmap_store,
 
     .bdrv_save_vmstate    = qcow2_save_vmstate,
diff --git a/block/qcow2.h b/block/qcow2.h
index ec42cec..05f59e0 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -608,6 +608,7 @@ int qcow2_read_snapshots(BlockDriverState *bs);
 void qcow2_free_dirty_bitmaps(BlockDriverState *bs);
 int qcow2_read_dirty_bitmaps(BlockDriverState *bs);
 
+bool qcow2_dirty_bitmap_load_check(BlockDriverState *file, const char *name);
 BdrvDirtyBitmap *qcow2_dirty_bitmap_load(BlockDriverState *bs_for,
                                          BlockDriverState *bs_file,
                                          const char *name,
diff --git a/include/block/block.h b/include/block/block.h
index 8166640..5e95e51 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -531,6 +531,8 @@ HBitmap *bdrv_create_meta_bitmap(BdrvDirtyBitmap *bitmap,
                                  uint64_t granularity);
 void bdrv_release_meta_bitmap(BdrvDirtyBitmap *bitmap);
 
+bool bdrv_load_check_dirty_bitmap(BlockDriverState *file, const char *name);
+
 void bdrv_enable_copy_on_read(BlockDriverState *bs);
 void bdrv_disable_copy_on_read(BlockDriverState *bs);
 
diff --git a/include/block/block_int.h b/include/block/block_int.h
index c66621e..2c35a73 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -204,6 +204,8 @@ struct BlockDriver {
     int (*bdrv_get_info)(BlockDriverState *bs, BlockDriverInfo *bdi);
     ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs);
 
+    bool (*bdrv_dirty_bitmap_load_check)(BlockDriverState *file,
+                                         const char *name);
     BdrvDirtyBitmap *(*bdrv_dirty_bitmap_load)(BlockDriverState *bs_for,
                                                BlockDriverState *bs_file,
                                                const char *name,
-- 
2.1.4