[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [RFC PATCH v2 1/6] dirty-bitmaps: allow merging to disabled
From: |
John Snow |
Subject: |
[Qemu-block] [RFC PATCH v2 1/6] dirty-bitmaps: allow merging to disabled bitmaps |
Date: |
Fri, 21 Sep 2018 18:28:42 -0400 |
We wish to prohibit merging to read-only bitmaps and frozen bitmaps,
but "disabled" bitmaps only preclude their recording of live, new
information. It does not prohibit them from manual writes at the behest
of the user, as is the case for merge operations.
Reported-by: Eric Blake <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
block/dirty-bitmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index c9b8a6fd52..fa7e75e0af 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -798,7 +798,7 @@ void bdrv_merge_dirty_bitmap(BdrvDirtyBitmap *dest, const
BdrvDirtyBitmap *src,
qemu_mutex_lock(dest->mutex);
- assert(bdrv_dirty_bitmap_enabled(dest));
+ assert(!bdrv_dirty_bitmap_frozen(dest));
assert(!bdrv_dirty_bitmap_readonly(dest));
if (!hbitmap_merge(dest->bitmap, src->bitmap)) {
--
2.14.4
- [Qemu-block] [RFC PATCH v2 0/6] dirty-bitmaps: fix QMP command permissions, John Snow, 2018/09/21
- [Qemu-block] [RFC PATCH v2 1/6] dirty-bitmaps: allow merging to disabled bitmaps,
John Snow <=
- [Qemu-block] [RFC PATCH v2 2/6] bitmaps: allow clear on disabled bitmaps, John Snow, 2018/09/21
- [Qemu-block] [RFC PATCH v2 3/6] bitmaps: prohibit merge on locked bitmaps, John Snow, 2018/09/21
- [Qemu-block] [RFC PATCH v2 4/6] bitmaps: add user_modifiable status checker, John Snow, 2018/09/21
- [Qemu-block] [RFC PATCH v2 5/6] bitmaps: prohibit enable/disable on locked/frozen bitmaps, John Snow, 2018/09/21
- [Qemu-block] [RFC PATCH v2 6/6] block/backup: prohibit backup from using in-use bitmaps, John Snow, 2018/09/21