[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 50/85] qcow2: add .bdrv_remove_persistent_dirty_bitma
From: |
Max Reitz |
Subject: |
[Qemu-block] [PULL 50/85] qcow2: add .bdrv_remove_persistent_dirty_bitmap |
Date: |
Tue, 11 Jul 2017 18:07:39 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Realize .bdrv_remove_persistent_dirty_bitmap interface.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
block/qcow2.h | 3 +++
block/qcow2-bitmap.c | 41 +++++++++++++++++++++++++++++++++++++++++
block/qcow2.c | 1 +
3 files changed, 45 insertions(+)
diff --git a/block/qcow2.h b/block/qcow2.h
index 084a298..2df05ac 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -653,5 +653,8 @@ bool qcow2_can_store_new_dirty_bitmap(BlockDriverState *bs,
const char *name,
uint32_t granularity,
Error **errp);
+void qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs,
+ const char *name,
+ Error **errp);
#endif
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index a8c7e1d..3e8735a 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -1237,6 +1237,47 @@ static Qcow2Bitmap *find_bitmap_by_name(Qcow2BitmapList
*bm_list,
return NULL;
}
+void qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs,
+ const char *name,
+ Error **errp)
+{
+ int ret;
+ BDRVQcow2State *s = bs->opaque;
+ Qcow2Bitmap *bm;
+ Qcow2BitmapList *bm_list;
+
+ if (s->nb_bitmaps == 0) {
+ /* Absence of the bitmap is not an error: see explanation above
+ * bdrv_remove_persistent_dirty_bitmap() definition. */
+ return;
+ }
+
+ bm_list = bitmap_list_load(bs, s->bitmap_directory_offset,
+ s->bitmap_directory_size, errp);
+ if (bm_list == NULL) {
+ return;
+ }
+
+ bm = find_bitmap_by_name(bm_list, name);
+ if (bm == NULL) {
+ goto fail;
+ }
+
+ QSIMPLEQ_REMOVE(bm_list, bm, Qcow2Bitmap, entry);
+
+ ret = update_ext_header_and_dir(bs, bm_list);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "Failed to update bitmap extension");
+ goto fail;
+ }
+
+ free_bitmap_clusters(bs, &bm->table);
+
+fail:
+ bitmap_free(bm);
+ bitmap_list_free(bm_list);
+}
+
void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp)
{
BdrvDirtyBitmap *bitmap;
diff --git a/block/qcow2.c b/block/qcow2.c
index d7046a3..9d3c70e 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3990,6 +3990,7 @@ BlockDriver bdrv_qcow2 = {
.bdrv_reopen_bitmaps_rw = qcow2_reopen_bitmaps_rw,
.bdrv_can_store_new_dirty_bitmap = qcow2_can_store_new_dirty_bitmap,
+ .bdrv_remove_persistent_dirty_bitmap =
qcow2_remove_persistent_dirty_bitmap,
};
static void bdrv_qcow2_init(void)
--
2.9.4
- [Qemu-block] [PULL 40/85] block/dirty-bitmap: add bdrv_dirty_bitmap_next(), (continued)
- [Qemu-block] [PULL 40/85] block/dirty-bitmap: add bdrv_dirty_bitmap_next(), Max Reitz, 2017/07/11
- [Qemu-block] [PULL 41/85] qcow2: add persistent dirty bitmaps support, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 42/85] qcow2: store bitmaps on reopening image as read-only, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 44/85] qcow2: add .bdrv_can_store_new_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 43/85] block: add bdrv_can_store_new_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 45/85] qmp: add persistent flag to block-dirty-bitmap-add, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 46/85] qmp: add autoload parameter to block-dirty-bitmap-add, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 48/85] iotests: test qcow2 persistent dirty bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 47/85] qmp: add x-debug-block-dirty-bitmap-sha256, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 49/85] block/dirty-bitmap: add bdrv_remove_persistent_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 50/85] qcow2: add .bdrv_remove_persistent_dirty_bitmap,
Max Reitz <=
- [Qemu-block] [PULL 52/85] block: release persistent bitmaps on inactivate, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 51/85] qmp: block-dirty-bitmap-remove: remove persistent, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 53/85] iotests: skip 159 & 170 with luks format, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 54/85] iotests: fix remainining tests to work with LUKS, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 55/85] iotests: reduce PBKDF iterations when testing LUKS, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 56/85] iotests: add more LUKS hash combination tests, Max Reitz, 2017/07/11