mirror of
https://git.proxmox.com/git/pve-qemu
synced 2025-10-04 21:36:20 +00:00
4154eea6e6
Fix the two issues reported in the community forum[0][1], i.e. regression in LSI-53c895a controller and ignored boot order for USB storage (only possible via custom arguments in Proxmox VE), both causing boot failures, and pick up fixes for VirtIO, ARM emulation, char IO device and a graph lock fix for the block layer. The block-copy patches that serve as a preparation for fleecing are moved to the extra folder, because the graph lock fix requires them to be present first. They have been applied upstream in the meantime and should drop out with the rebase on 9.1. [0]: https://forum.proxmox.com/threads/149772/post-679433 [1]: https://forum.proxmox.com/threads/149772/post-683459 Signed-off-by: Fiona Ebner <f.ebner@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 f3e508a6a7..37b8437f3e 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) {
|