[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH] dirty-bitmaps: allow merging to disabled bitmaps

From: John Snow
Subject: [Qemu-devel] [PATCH] dirty-bitmaps: allow merging to disabled bitmaps
Date: Wed, 19 Sep 2018 15:58:47 -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,
-    assert(bdrv_dirty_bitmap_enabled(dest));
+    assert(!bdrv_dirty_bitmap_frozen(dest));
     if (!hbitmap_merge(dest->bitmap, src->bitmap)) {

reply via email to

[Prev in Thread] Current Thread [Next in Thread]