commit 06207b0ff596aa4bb192d1fafc593847ed888e39
author John Snow <jsnow@redhat.com> Wed Jun 10 13:24:54 2015 -0400
committer Kevin Wolf <kwolf@redhat.com> Fri Jun 12 15:54:01 2015 +0200
tree a40caaf49f583b6a594d0cfd6d3108c17b4cfd3a
parent 5270b6a0d0cf41e49d634007ace40f5dfc381940

block: Change bitmap truncate conditional to assertion

This is an artifact of an older version that had both all-bitmap and
single-bitmap truncate functions, and some info got lost in the shuffle.

Bitmaps can only be frozen during a backup operation, and a backup
operation should prevent a resize operation, so just assert that this
cannot happen.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

block.c

diff --git a/block.c b/block.c
index 2786e47..4ea2c4f 100644
--- a/block.c
+++ b/block.c
@@ -3220,9 +3220,7 @@
     uint64_t size = bdrv_nb_sectors(bs);
 
     QLIST_FOREACH(bitmap, &bs->dirty_bitmaps, list) {
-        if (bdrv_dirty_bitmap_frozen(bitmap)) {
-            continue;
-        }
+        assert(!bdrv_dirty_bitmap_frozen(bitmap));
         hbitmap_truncate(bitmap->bitmap, size);
         bitmap->size = size;
     }