[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 03/10] block/dirty-bitmap: remove set/reset asser
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v3 03/10] block/dirty-bitmap: remove set/reset assertions against enabled bit |
Date: |
Fri, 22 Feb 2019 19:06:07 -0500 |
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>
---
block/dirty-bitmap.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index aa3f86bb73..9ea5738420 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -542,7 +542,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);
}
@@ -559,7 +558,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] [PATCH v3 05/10] nbd: change error checking order for bitmaps, (continued)
- [Qemu-devel] [PATCH v3 05/10] nbd: change error checking order for bitmaps, John Snow, 2019/02/22
- [Qemu-devel] [PATCH v3 10/10] iotests: add busy/recording bit test to 124, John Snow, 2019/02/22
- [Qemu-devel] [PATCH v3 07/10] block/dirty-bitmaps: unify qmp_locked and user_locked calls, John Snow, 2019/02/22
- [Qemu-devel] [PATCH v3 03/10] block/dirty-bitmap: remove set/reset assertions against enabled bit,
John Snow <=
- [Qemu-devel] [PATCH v3 08/10] block/dirty-bitmaps: move comment block, John Snow, 2019/02/22
- Re: [Qemu-devel] [PATCH v3 00/10] dirty-bitmaps: deprecate @status field, John Snow, 2019/02/25
- Re: [Qemu-devel] [PATCH v3 00/10] dirty-bitmaps: deprecate @status field, no-reply, 2019/02/27