[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 04/12] qcow2/dirty-bitmaps: load IN_USE bitmaps
From: |
John Snow |
Subject: |
[Qemu-devel] [RFC PATCH 04/12] qcow2/dirty-bitmaps: load IN_USE bitmaps if disk is RO |
Date: |
Fri, 11 May 2018 21:25:29 -0400 |
For the purposes of qemu-img manipulation and querying of bitmaps, load
bitmaps that are "in use" -- if the image is read only. This will allow
us to diagnose problems with this flag using the qemu-img tool.
Signed-off-by: John Snow <address@hidden>
---
block/qcow2-bitmap.c | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index fc8d52fc3e..b556dbdccd 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -346,7 +346,7 @@ static BdrvDirtyBitmap *load_bitmap(BlockDriverState *bs,
uint32_t granularity;
BdrvDirtyBitmap *bitmap = NULL;
- if (bm->flags & BME_FLAG_IN_USE) {
+ if (can_write(bs) && (bm->flags & BME_FLAG_IN_USE)) {
error_setg(errp, "Bitmap '%s' is in use", bm->name);
goto fail;
}
@@ -974,23 +974,21 @@ bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Error
**errp)
}
QSIMPLEQ_FOREACH(bm, bm_list, entry) {
- if (!(bm->flags & BME_FLAG_IN_USE)) {
- BdrvDirtyBitmap *bitmap = load_bitmap(bs, bm, errp);
- if (bitmap == NULL) {
- goto fail;
- }
- bm->dirty_bitmap = bitmap;
+ BdrvDirtyBitmap *bitmap = load_bitmap(bs, bm, errp);
+ if (bitmap == NULL) {
+ goto fail;
+ }
+ bm->dirty_bitmap = bitmap;
- if (!(bm->flags & BME_FLAG_AUTO)) {
- bdrv_disable_dirty_bitmap(bitmap);
- }
- bdrv_dirty_bitmap_set_persistance(bitmap, true);
- if (can_write(bs)) {
- bm->flags |= BME_FLAG_IN_USE;
- needs_update = true;
- } else {
- bdrv_dirty_bitmap_set_readonly(bitmap, true);
- }
+ if (!(bm->flags & BME_FLAG_AUTO)) {
+ bdrv_disable_dirty_bitmap(bitmap);
+ }
+ bdrv_dirty_bitmap_set_persistance(bitmap, true);
+ if (can_write(bs)) {
+ bm->flags |= BME_FLAG_IN_USE;
+ needs_update = true;
+ } else {
+ bdrv_dirty_bitmap_set_readonly(bitmap, true);
}
}
--
2.14.3
- [Qemu-devel] [RFC PATCH 00/12] qemu-img: add bitmap queries, John Snow, 2018/05/11
- [Qemu-devel] [RFC PATCH 02/12] qcow2/dirty-bitmap: cache loaded bitmaps, John Snow, 2018/05/11
- [Qemu-devel] [RFC PATCH 05/12] qcow2-bitmap: track bitmap type, John Snow, 2018/05/11
- [Qemu-devel] [RFC PATCH 09/12] qapi/block-core: add BitmapMapping and BitmapEntry structs, John Snow, 2018/05/11
- [Qemu-devel] [RFC PATCH 12/12] qemu-img: add bitmap clear, John Snow, 2018/05/11
- [Qemu-devel] [RFC PATCH 04/12] qcow2/dirty-bitmaps: load IN_USE bitmaps if disk is RO,
John Snow <=
- [Qemu-devel] [RFC PATCH 03/12] block/qcow2-bitmap: avoid adjusting bm->flags for RO bitmaps, John Snow, 2018/05/11
- [Qemu-devel] [RFC PATCH 08/12] qjson: allow caller to ask for arbitrary indent, John Snow, 2018/05/11
- [Qemu-devel] [RFC PATCH 06/12] qapi: add bitmap info, John Snow, 2018/05/11