[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/17] qcow2-dirty-bitmap: add AUTO flag
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 16/17] qcow2-dirty-bitmap: add AUTO flag |
Date: |
Wed, 17 Feb 2016 18:29:08 +0300 |
The bitmap should be auto-loaded if auto flag is set.
For now, actually, there are no methods to set it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/qcow2-dirty-bitmap.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/block/qcow2-dirty-bitmap.c b/block/qcow2-dirty-bitmap.c
index 8e9fd81..cc104b5 100644
--- a/block/qcow2-dirty-bitmap.c
+++ b/block/qcow2-dirty-bitmap.c
@@ -40,8 +40,9 @@
#define BME_MAX_NAME_SIZE 1023
/* Bitmap directory entry flags */
-#define BME_RESERVED_FLAGS 0xfffffffe
+#define BME_RESERVED_FLAGS 0xfffffffc
#define BME_FLAG_IN_USE 1
+#define BME_FLAG_AUTO (1U << 1)
/* bits [1, 8] U [56, 63] are reserved */
#define BME_TABLE_ENTRY_RESERVED_MASK 0xff000000000001fe
@@ -50,6 +51,9 @@ typedef enum BitmapType {
BT_DIRTY_TRACKING_BITMAP = 1
} BitmapType;
+static BdrvDirtyBitmap *load_bitmap(BlockDriverState *bs, QCow2Bitmap *bm,
+ Error **errp);
+
void qcow2_free_bitmaps(BlockDriverState *bs)
{
BDRVQcow2State *s = bs->opaque;
@@ -213,6 +217,13 @@ static int directory_read(BlockDriverState *bs, Error
**errp)
bm->offset = offset;
bm->name = g_strndup((char *)(h + 1), h->name_size);
+ if (h->flags & BME_FLAG_AUTO) {
+ load_bitmap(bs, bm, errp);
+ if (*errp != NULL) {
+ goto fail;
+ }
+ }
+
offset += dir_entry_size(h);
}
return 0;
--
1.8.3.1
- [Qemu-devel] [PATCH 06/17] qcow2: add dirty bitmaps extension, (continued)
- [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, 2016/02/17
- [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 <=
- [Qemu-devel] [PATCH 14/17] iotests: add VM.test_launcn(), Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 17/17] qcow2-dirty-bitmap: add EXTRA_DATA_COMPATIBLE flag, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 15/17] iotests: test internal persistent dirty bitmap, Vladimir Sementsov-Ogievskiy, 2016/02/17
- Re: [Qemu-devel] [PATCH v4 RFC 00/17] qcow2: persistent dirty bitmaps, John Snow, 2016/02/26