60ae3775bf
No major semantic changes, mostly just deprecations and changed function signatures. Drop the extra/ patches, as they have been applied upstream. The added extra/ patch was accepted upstream[0] but has not been picked up for 5.1. It is required for non-4M aligned backups to work with PBS. [0] https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg01671.html Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
Date: Mon, 6 Apr 2020 12:16:54 +0200
|
|
Subject: [PATCH] PVE: [Compat]: 4.0 used balloon qemu-4-0-config-size false
|
|
here
|
|
|
|
The underlying issue why this change from upstream to us arised in
|
|
the first place is that QEMU 4.0 was already released at the point we
|
|
run into this migration issue, so we did the then obvious fallback to
|
|
false for virtio-balloon-device qemu-4-0-config-size.
|
|
|
|
QEMU made that switch back in 4.1, where it now uses a backward
|
|
compatible mechanism to detect if the bigger CFG sizes should be
|
|
used, i.e., checking the VIRTIO_BALLOON_F_PAGE_POISON or
|
|
VIRTIO_BALLOON_F_FREE_PAGE_HINT balloon feature flags.
|
|
As for them, upstream released version 4.0 had this to true they keep
|
|
it to true in their compatibility record for the 4.0 machine, to
|
|
allow live migrations from 4.0 to 4.1.
|
|
As for us, downstream released version 4.0 (first public release of
|
|
this QEMU) had this to false, we change it back to false again, for
|
|
the same reason.
|
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
hw/core/machine.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/core/machine.c b/hw/core/machine.c
|
|
index 8d1a90c6cf..413902777e 100644
|
|
--- a/hw/core/machine.c
|
|
+++ b/hw/core/machine.c
|
|
@@ -66,7 +66,8 @@ GlobalProperty hw_compat_4_0[] = {
|
|
{ "virtio-vga", "edid", "false" },
|
|
{ "virtio-gpu-device", "edid", "false" },
|
|
{ "virtio-device", "use-started", "false" },
|
|
- { "virtio-balloon-device", "qemu-4-0-config-size", "true" },
|
|
+ // PVE differed from upstream for 4.0 balloon cfg size
|
|
+ { "virtio-balloon-device", "qemu-4-0-config-size", "false" },
|
|
{ "pl031", "migrate-tick-offset", "false" },
|
|
};
|
|
const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0);
|