From 06207b0ff596aa4bb192d1fafc593847ed888e39 Mon Sep 17 00:00:00 2001 From: John Snow Date: Wed, 10 Jun 2015 13:24:54 -0400 Subject: 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 Signed-off-by: John Snow Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- block.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'block.c') diff --git a/block.c b/block.c index 2786e47..4ea2c4f 100644 --- a/block.c +++ b/block.c @@ -3220,9 +3220,7 @@ static void bdrv_dirty_bitmap_truncate(BlockDriverState *bs) 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; } -- cgit v1.1