[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/17] qcow2-dirty-bitmap: add qcow2_bitmap_load_che
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 07/17] qcow2-dirty-bitmap: add qcow2_bitmap_load_check() |
Date: |
Wed, 17 Feb 2016 18:28:59 +0300 |
The function checks existing of the bitmap without loading it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/dirty-bitmap.c | 15 +++++++++++++++
block/qcow2-dirty-bitmap.c | 5 +++++
block/qcow2.c | 1 +
block/qcow2.h | 1 +
include/block/block_int.h | 2 ++
include/block/dirty-bitmap.h | 1 +
6 files changed, 25 insertions(+)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 982f930..115efb8 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -514,3 +514,18 @@ int bdrv_dirty_bitmap_store(const BdrvDirtyBitmap *bitmap,
BlockDriverState *bs,
{
return hbitmap_store(bitmap->bitmap, bs, table, table_size, cluster_size);
}
+
+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->bs, name);
+ }
+ return false;
+}
diff --git a/block/qcow2-dirty-bitmap.c b/block/qcow2-dirty-bitmap.c
index 979e17e..9f8ad6b 100644
--- a/block/qcow2-dirty-bitmap.c
+++ b/block/qcow2-dirty-bitmap.c
@@ -274,6 +274,11 @@ static int load_bitmap_data(BlockDriverState *bs, const
uint64_t *bitmap_table,
return ret;
}
+bool qcow2_bitmap_load_check(BlockDriverState *file, const char *name)
+{
+ return find_bitmap_by_name(file, name) != NULL;
+}
+
static BdrvDirtyBitmap *load_bitmap(BlockDriverState *bs, QCow2Bitmap *bm,
Error **errp)
{
diff --git a/block/qcow2.c b/block/qcow2.c
index 6b6914d..0e75eeb 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3436,6 +3436,7 @@ BlockDriver bdrv_qcow2 = {
.bdrv_get_specific_info = qcow2_get_specific_info,
.bdrv_dirty_bitmap_load = qcow2_bitmap_load,
+ .bdrv_dirty_bitmap_load_check = qcow2_bitmap_load_check,
.bdrv_dirty_bitmap_store = qcow2_bitmap_store,
.bdrv_save_vmstate = qcow2_save_vmstate,
diff --git a/block/qcow2.h b/block/qcow2.h
index e4a517c..423c279 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -620,6 +620,7 @@ int qcow2_read_snapshots(BlockDriverState *bs);
void qcow2_free_bitmaps(BlockDriverState *bs);
int qcow2_read_bitmaps(BlockDriverState *bs, Error **errp);
+bool qcow2_bitmap_load_check(BlockDriverState *file, const char *name);
BdrvDirtyBitmap *qcow2_bitmap_load(BlockDriverState *bs, const char *name,
Error **errp);
void qcow2_bitmap_store(BlockDriverState *bs, const BdrvDirtyBitmap *bitmap,
diff --git a/include/block/block_int.h b/include/block/block_int.h
index be8f8a3..59948e9 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -214,6 +214,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,
const char *name,
Error **errp);
diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h
index 1e16a5f..5d8c2c1 100644
--- a/include/block/dirty-bitmap.h
+++ b/include/block/dirty-bitmap.h
@@ -78,5 +78,6 @@ int bdrv_dirty_bitmap_prepare_store(const BdrvDirtyBitmap
*bitmap,
int bdrv_dirty_bitmap_store(const BdrvDirtyBitmap *bitmap, BlockDriverState
*bs,
const uint64_t *table, uint32_t table_size,
uint32_t cluster_size);
+bool bdrv_load_check_dirty_bitmap(BlockDriverState *file, const char *name);
#endif
--
1.8.3.1
- [Qemu-devel] [PATCH v4 RFC 00/17] qcow2: persistent dirty bitmaps, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 02/17] qcow2: Bitmaps extension: structs and consts, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 01/17] hbitmap: load/store, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 04/17] qcow2-dirty-bitmap: add qcow2_bitmap_load(), Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 06/17] qcow2: add dirty bitmaps extension, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 07/17] qcow2-dirty-bitmap: add qcow2_bitmap_load_check(),
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH 03/17] qcow2-dirty-bitmap: read dirty bitmap directory, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 05/17] qcow2-dirty-bitmap: add qcow2_bitmap_store(), Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 08/17] block: store persistent dirty bitmaps, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 10/17] qcow2-dirty-bitmap: add autoclear bit, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 09/17] block: add bdrv_load_dirty_bitmap(), Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 11/17] qemu: command line option for dirty bitmaps, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 12/17] qcow2-dirty-bitmap: add IN_USE flag, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 13/17] qcow2-dirty-bitmaps: disallow stroing bitmap to other bs, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 16/17] qcow2-dirty-bitmap: add AUTO flag, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 14/17] iotests: add VM.test_launcn(), Vladimir Sementsov-Ogievskiy, 2016/02/17