debian/patches/pve/0055-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch

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