4fbd50e2f9
Biggest change is that AioContext locking got removed, but no changes required other than dropping the calls to acquire and release it. As a consequence, the single parameter for the bdrv_graph_wrlock() call got removed which also required adaptation. QAPI docs became stricter requiring to document all members. Other minor changes: - Single parameter from migration_is_running() was dropped. - qemu_mutex_(un)lock_iothread() got renamed to bql_(un)lock(). Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
32 lines
1.1 KiB
Diff
32 lines
1.1 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: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>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
blockdev.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/blockdev.c b/blockdev.c
|
|
index 8682814a7a..5b75a085ee 100644
|
|
--- a/blockdev.c
|
|
+++ b/blockdev.c
|
|
@@ -2873,6 +2873,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 (!replaces) {
|