2019-11-22 12:07:23 +03:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
2020-04-07 17:53:19 +03:00
|
|
|
Date: Mon, 6 Apr 2020 12:16:54 +0200
|
|
|
|
Subject: [PATCH] PVE: [Compat]: 4.0 used balloon qemu-4-0-config-size false
|
|
|
|
here
|
2019-11-22 12:07:23 +03:00
|
|
|
|
|
|
|
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
|
update submodule and patches to QEMU 8.0.0
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2023-05-15 16:39:53 +03:00
|
|
|
index cd13b8b0a3..cb1d334bcb 100644
|
2019-11-22 12:07:23 +03:00
|
|
|
--- a/hw/core/machine.c
|
|
|
|
+++ b/hw/core/machine.c
|
update submodule and patches to QEMU 8.0.0
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2023-05-15 16:39:53 +03:00
|
|
|
@@ -141,7 +141,8 @@ GlobalProperty hw_compat_4_0[] = {
|
2019-11-22 12:07:23 +03:00
|
|
|
{ "virtio-vga", "edid", "false" },
|
2020-04-07 17:53:19 +03:00
|
|
|
{ "virtio-gpu-device", "edid", "false" },
|
2019-11-22 12:07:23 +03:00
|
|
|
{ "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);
|