8dca018b68
Mostly minor changes, bigger ones summarized: * QEMU's internal backup code now uses a new async system, which allows parallel requests - the default max_workers settings is 64, I chose less, since 64 put enough stress on QEMU that the guest became practically unusable during the backup, and 16 still shows quite a nice measureable performance improvement. Little code changes for us though. * 'malformed' QAPI parameters/functions are now a build error (i.e. using '_' vs '-'), I chose to just whitelist our calls in the name of backwards compatibility. * monitor OOB race fix now uses the upstream variant, cherry-picked from origin/master since it's not in 6.0 by default * last patch fixes a bug with snapshot rollback related to the new yank system Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
31 lines
1022 B
Diff
31 lines
1022 B
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:05 +0200
|
|
Subject: [PATCH] mirror: add check for bitmap-mode without bitmap
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
as one without the other does not make much sense with the current set
|
|
of modes.
|
|
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
---
|
|
blockdev.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/blockdev.c b/blockdev.c
|
|
index 798d02704f..c025fbf567 100644
|
|
--- a/blockdev.c
|
|
+++ b/blockdev.c
|
|
@@ -3062,6 +3062,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
|
|
if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_ALLOW_RO, errp)) {
|
|
return;
|
|
}
|
|
+ } else if (has_bitmap_mode) {
|
|
+ error_setg(errp, "Cannot specify bitmap sync mode without a bitmap");
|
|
+ return;
|
|
}
|
|
|
|
if (!has_replaces) {
|