[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 02/11] block/dirty-bitmap: remove assertion from
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v5 02/11] block/dirty-bitmap: remove assertion from restore |
Date: |
Wed, 19 Dec 2018 21:29:43 -0500 |
When making a backup of a dirty bitmap (for transactions), we want to
restore that backup whether or not the bitmap is enabled or not.
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.
Signed-off-by: John Snow <address@hidden>
---
block/dirty-bitmap.c | 1 -
1 file changed, 1 deletion(-)
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);
--
2.17.2
- [Qemu-devel] [PATCH v5 00/11] bitmaps: remove x- prefix from QMP api, John Snow, 2018/12/19
- [Qemu-devel] [PATCH v5 01/11] blockdev: abort transactions in reverse order, John Snow, 2018/12/19
- [Qemu-devel] [PATCH v5 02/11] block/dirty-bitmap: remove assertion from restore,
John Snow <=
- [Qemu-devel] [PATCH v5 03/11] blockdev: n-ary bitmap merge, John Snow, 2018/12/19
- [Qemu-devel] [PATCH v5 04/11] block: remove 'x' prefix from experimental bitmap APIs, John Snow, 2018/12/19
- [Qemu-devel] [PATCH v5 06/11] iotests: add filter_generated_node_ids, John Snow, 2018/12/19
- [Qemu-devel] [PATCH v5 05/11] iotests.py: don't abort if IMGKEYSECRET is undefined, John Snow, 2018/12/19
- [Qemu-devel] [PATCH v5 08/11] iotests: remove default filters from qmp_log, John Snow, 2018/12/19