[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/22] block/dirty-bitmap: remove set/reset assertion
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL 03/22] block/dirty-bitmap: remove set/reset assertions against enabled bit |
Date: |
Tue, 12 Mar 2019 16:23:18 -0400 |
bdrv_set_dirty_bitmap and bdrv_reset_dirty_bitmap are only used as an
internal API by the mirror and migration areas of our code. These
calls modify the bitmap, but do so at the behest of QEMU and not the
guest.
Presently, these bitmaps are always "enabled" anyway, but there's no
reason they have to be.
Modify these internal APIs to drop this assertion.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>
---
block/dirty-bitmap.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index f8984b8693..7dc5b559d0 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -544,7 +544,6 @@ int64_t bdrv_dirty_iter_next(BdrvDirtyBitmapIter *iter)
void bdrv_set_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap,
int64_t offset, int64_t bytes)
{
- assert(bdrv_dirty_bitmap_enabled(bitmap));
assert(!bdrv_dirty_bitmap_readonly(bitmap));
hbitmap_set(bitmap->bitmap, offset, bytes);
}
@@ -561,7 +560,6 @@ void bdrv_set_dirty_bitmap(BdrvDirtyBitmap *bitmap,
void bdrv_reset_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap,
int64_t offset, int64_t bytes)
{
- assert(bdrv_dirty_bitmap_enabled(bitmap));
assert(!bdrv_dirty_bitmap_readonly(bitmap));
hbitmap_reset(bitmap->bitmap, offset, bytes);
}
--
2.17.2
- [Qemu-devel] [PULL 00/22] Bitmaps patches, John Snow, 2019/03/12
- [Qemu-devel] [PULL 01/22] block/dirty-bitmap: add recording and busy properties, John Snow, 2019/03/12
- [Qemu-devel] [PULL 03/22] block/dirty-bitmap: remove set/reset assertions against enabled bit,
John Snow <=
- [Qemu-devel] [PULL 02/22] block/dirty-bitmaps: rename frozen predicate helper, John Snow, 2019/03/12
- [Qemu-devel] [PULL 04/22] block/dirty-bitmap: change semantics of enabled predicate, John Snow, 2019/03/12
- [Qemu-devel] [PULL 05/22] nbd: change error checking order for bitmaps, John Snow, 2019/03/12
- [Qemu-devel] [PULL 06/22] block/dirty-bitmap: explicitly lock bitmaps with successors, John Snow, 2019/03/12
- [Qemu-devel] [PULL 08/22] block/dirty-bitmaps: move comment block, John Snow, 2019/03/12
- [Qemu-devel] [PULL 09/22] blockdev: remove unused paio parameter documentation, John Snow, 2019/03/12
- [Qemu-devel] [PULL 07/22] block/dirty-bitmaps: unify qmp_locked and user_locked calls, John Snow, 2019/03/12
- [Qemu-devel] [PULL 11/22] block/dirty-bitmaps: add inconsistent bit, John Snow, 2019/03/12
- [Qemu-devel] [PULL 10/22] iotests: add busy/recording bit test to 124, John Snow, 2019/03/12
- [Qemu-devel] [PULL 12/22] block/dirty-bitmap: add inconsistent status, John Snow, 2019/03/12