[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 18/22] qcow2-dirty-bitmaps: disallow stroing bitmap
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH 18/22] qcow2-dirty-bitmaps: disallow stroing bitmap to other bs |
Date: |
Tue, 15 Mar 2016 23:04:24 +0300 |
Check, that bitmap is stored to the owning bs.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/dirty-bitmap.c | 12 ++++++++++++
block/qcow2-dirty-bitmap.c | 5 +++++
include/block/dirty-bitmap.h | 2 ++
3 files changed, 19 insertions(+)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 87ee4d7..9625f4a 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -485,3 +485,15 @@ BdrvDirtyBitmap *bdrv_load_dirty_bitmap(BlockDriverState
*bs, const char *name,
}
return NULL;
}
+
+bool bdrv_has_dirty_bitmap(BlockDriverState *bs, const BdrvDirtyBitmap *bitmap)
+{
+ BdrvDirtyBitmap *bm, *next;
+ QLIST_FOREACH_SAFE(bm, &bs->dirty_bitmaps, list, next) {
+ if (bm == bitmap) {
+ return true;
+ }
+ }
+
+ return false;
+}
diff --git a/block/qcow2-dirty-bitmap.c b/block/qcow2-dirty-bitmap.c
index f210fee..70c6e36 100644
--- a/block/qcow2-dirty-bitmap.c
+++ b/block/qcow2-dirty-bitmap.c
@@ -757,6 +757,11 @@ void qcow2_bitmap_store(BlockDriverState *bs,
uint64_t size = bdrv_dirty_bitmap_size(bitmap);
int granularity = bdrv_dirty_bitmap_granularity(bitmap);
+ if (!bdrv_has_dirty_bitmap(bs, bitmap)) {
+ error_setg(errp, "Can't store bitmap to the other node.");
+ return;
+ }
+
/* find/create dirty bitmap */
bm = find_bitmap_by_name(bs, name);
if (bm == NULL) {
diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h
index 66ba3f8..af76ac1 100644
--- a/include/block/dirty-bitmap.h
+++ b/include/block/dirty-bitmap.h
@@ -62,4 +62,6 @@ void bdrv_finalize_persistent_dirty_bitmaps(BlockDriverState
*bs);
BdrvDirtyBitmap *bdrv_load_dirty_bitmap(BlockDriverState *bs, const char *name,
Error **errp);
+bool bdrv_has_dirty_bitmap(BlockDriverState *bs, const BdrvDirtyBitmap
*bitmap);
+
#endif
--
1.8.3.1
- [Qemu-block] [PATCH 02/22] block: fix bdrv_dirty_bitmap_granularity signature, (continued)
- [Qemu-block] [PATCH 02/22] block: fix bdrv_dirty_bitmap_granularity signature, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-block] [PATCH 22/22] qcow2-dirty-bitmap: add EXTRA_DATA_COMPATIBLE flag, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-block] [PATCH 19/22] iotests: add VM.test_launcn(), Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-block] [PATCH 03/22] iotests: maintain several vms in test, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-block] [PATCH 04/22] iotests: add default node-name, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-block] [PATCH 21/22] qcow2-dirty-bitmap: add AUTO flag, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-block] [PATCH 05/22] qapi: add md5 checksum of last dirty bitmap level to query-block, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-block] [PATCH 18/22] qcow2-dirty-bitmaps: disallow stroing bitmap to other bs,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH 14/22] block: add bdrv_load_dirty_bitmap(), Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-block] [PATCH 13/22] block: store persistent dirty bitmaps, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-block] [PATCH 17/22] qcow2-dirty-bitmap: add IN_USE flag, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-block] [PATCH 12/22] qcow2-dirty-bitmap: add qcow2_bitmap_load_check(), Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-block] [PATCH 20/22] iotests: test internal persistent dirty bitmap, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-block] [PATCH 09/22] qcow2-dirty-bitmap: add qcow2_bitmap_load(), Vladimir Sementsov-Ogievskiy, 2016/03/15