From: John Snow Date: Fri, 21 Dec 2018 09:35:20 +0000 (-0500) Subject: block/dirty-bitmap: remove assertion from restore X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=07d5a8df6a0018d831baef6d50f53f31a06b5a60;p=qemu.git block/dirty-bitmap: remove assertion from restore When making a backup of a dirty bitmap (for transactions), we want to restore that backup whether or not the bitmap is enabled. It is perfectly valid to write into bitmaps that are disabled. It is only illegitimate for the guest to have done so. Remove this assertion. Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: John Snow Message-Id: <20181221093529.23855-3-jsnow@redhat.com> Signed-off-by: Eric Blake --- diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 89fd1d7f8b..6b688394e4 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -625,7 +625,6 @@ void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out) void bdrv_restore_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *backup) { HBitmap *tmp = bitmap->bitmap; - assert(bdrv_dirty_bitmap_enabled(bitmap)); assert(!bdrv_dirty_bitmap_readonly(bitmap)); bitmap->bitmap = backup; hbitmap_free(tmp);