2020-11-04 20:35:50 +03:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Stefan Reiter <s.reiter@proxmox.com>
|
|
|
|
|
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 <s.reiter@proxmox.com>
|
2022-01-13 12:34:33 +03:00
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
2020-11-04 20:35:50 +03:00
|
|
|
---
|
|
|
|
|
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
|
2023-07-28 12:44:57 +03:00
|
|
|
index 7eaf498439..509f3df0a6 100644
|
2020-11-04 20:35:50 +03:00
|
|
|
--- a/migration/block-dirty-bitmap.c
|
|
|
|
|
+++ b/migration/block-dirty-bitmap.c
|
update submodule and patches to QEMU 8.0.0
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2023-05-15 16:39:53 +03:00
|
|
|
@@ -539,7 +539,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
|
2020-11-04 20:35:50 +03:00
|
|
|
|
|
|
|
|
if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, &local_err)) {
|
|
|
|
|
error_report_err(local_err);
|
|
|
|
|
- return -1;
|
|
|
|
|
+ continue;
|
|
|
|
|
}
|
|
|
|
|
|
2021-02-11 19:11:11 +03:00
|
|
|
if (bitmap_aliases) {
|