]>
Commit | Line | Data |
---|---|---|
f36fa391 TL |
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> | |
ddbf7a87 | 16 | Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> |
f36fa391 TL |
17 | --- |
18 | migration/block-dirty-bitmap.c | 2 +- | |
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
20 | ||
21 | diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c | |
4fbd50e2 | 22 | index 2708abf3d7..fb17c01308 100644 |
f36fa391 TL |
23 | --- a/migration/block-dirty-bitmap.c |
24 | +++ b/migration/block-dirty-bitmap.c | |
10e10933 | 25 | @@ -540,7 +540,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs, |
f36fa391 TL |
26 | |
27 | if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, &local_err)) { | |
28 | error_report_err(local_err); | |
29 | - return -1; | |
30 | + continue; | |
31 | } | |
32 | ||
817b7667 | 33 | if (bitmap_aliases) { |