On 06/22/2016 11:22 AM, Max Reitz wrote: > On 03.06.2016 06:32, Fam Zheng wrote: >> Upon each bit toggle, the corresponding bit in the meta bitmap will be >> set. >> >> Signed-off-by: Fam Zheng <f...@redhat.com> >> Reviewed-by: John Snow <js...@redhat.com> >> --- >> block/dirty-bitmap.c | 2 +- >> include/qemu/hbitmap.h | 17 +++++++++++++ >> util/hbitmap.c | 69 >> +++++++++++++++++++++++++++++++++++++++----------- >> 3 files changed, 72 insertions(+), 16 deletions(-) >> >> diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c >> index ec073ee..628b77c 100644 >> --- a/block/dirty-bitmap.c >> +++ b/block/dirty-bitmap.c >> @@ -231,7 +231,7 @@ static void >> bdrv_do_release_matching_dirty_bitmap(BlockDriverState *bs, >> BdrvDirtyBitmap *bm, *next; >> QLIST_FOREACH_SAFE(bm, &bs->dirty_bitmaps, list, next) { >> if ((!bitmap || bm == bitmap) && (!only_named || bm->name)) { >> - assert(!bitmap->active_iterators); >> + assert(!bm->active_iterators); > > Same comment as for v4, this should be squashed into the previous patch. > > Max >
Ah, replied too soon on #1. Thanks :)