From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Stefan Reiter Date: Tue, 3 Nov 2020 14:57:32 +0100 Subject: [PATCH] migration/block-dirty-bitmap: migrate other bitmaps even if one fails If the checks in bdrv_dirty_bitmap_check fail, that only means that this one specific bitmap cannot be migrated. That is not an error condition for any other bitmaps on the same block device. Fixes dirty-bitmap migration with sync=bitmap, as the bitmaps used for that are obviously marked as "busy", which would cause none at all to be transferred. Signed-off-by: Stefan Reiter --- migration/block-dirty-bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index c61d382be8..26e4e5c99c 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -534,7 +534,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs, if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, &local_err)) { error_report_err(local_err); - return -1; + continue; } if (bitmap_aliases) {