817b7667e8
Lots of patches touched and some slight changes to the build process since QEMU switched to meson as their build system. Functionality-wise very little rebasing required. New patches introduced: * pve/0058: to fix VMA backups and clean up some code in general with new 5.2 features now available to us (namely coroutine-enabled QMP). * extra/0002: don't build man pages for guest agent when disabled * extra/0003: fix live-migration with hugepages * 0017 and 0018 are adjusted to fix snapshot abort and improve snap performance a bit Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
|
Date: Mon, 6 Apr 2020 12:17:06 +0200
|
|
Subject: [PATCH] mirror: switch to bdrv_dirty_bitmap_merge_internal
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
since sync_bitmap is busy at the point of merging, and we checked access
|
|
beforehand.
|
|
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
---
|
|
block/mirror.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/block/mirror.c b/block/mirror.c
|
|
index d1cce079da..e6140cf018 100644
|
|
--- a/block/mirror.c
|
|
+++ b/block/mirror.c
|
|
@@ -759,8 +759,8 @@ static int mirror_exit_common(Job *job)
|
|
job->ret == 0 && ret == 0)) {
|
|
/* Success; synchronize copy back to sync. */
|
|
bdrv_clear_dirty_bitmap(s->sync_bitmap, NULL);
|
|
- bdrv_merge_dirty_bitmap(s->sync_bitmap, s->dirty_bitmap,
|
|
- NULL, &error_abort);
|
|
+ bdrv_dirty_bitmap_merge_internal(s->sync_bitmap, s->dirty_bitmap,
|
|
+ NULL, true);
|
|
}
|
|
}
|
|
bdrv_release_dirty_bitmap(s->dirty_bitmap);
|
|
@@ -1793,8 +1793,8 @@ static BlockJob *mirror_start_job(
|
|
}
|
|
|
|
if (s->sync_mode == MIRROR_SYNC_MODE_BITMAP) {
|
|
- bdrv_merge_dirty_bitmap(s->dirty_bitmap, s->sync_bitmap,
|
|
- NULL, &local_err);
|
|
+ bdrv_dirty_bitmap_merge_internal(s->dirty_bitmap, s->sync_bitmap,
|
|
+ NULL, true);
|
|
if (local_err) {
|
|
goto fail;
|
|
}
|