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 7.1.0
Notable changes:
* The only big change is the switch to using a custom QIOChannel for
savevm-async, because the previously used QEMUFileOps was dropped.
Changes to the current implementation:
* Switch to vector based methods as required for an IO channel. For
short reads the passed-in IO vector is stuffed with zeroes at the
end, just to be sure.
* For reading: The documentation in include/io/channel.h states that
at least one byte should be read, so also error out when whe are
at the very end instead of returning 0.
* For reading: Fix off-by-one error when request goes beyond end.
The wrong code piece was:
if ((pos + size) > maxlen) {
size = maxlen - pos - 1;
}
Previously, the last byte would not be read. It's actually
possible to get a snapshot .raw file that has content all the way
up the final 512 byte (= BDRV_SECTOR_SIZE) boundary without any
trailing zero bytes (I wrote a script to do it).
Luckily, it didn't cause a real issue, because qemu_loadvm_state()
is not interested in the final (i.e. QEMU_VM_VMDESCRIPTION)
section. The buffer for reading it is simply freed up afterwards
and the function will assume that it read the whole section, even
if that's not the case.
* For writing: Make use of the generated blk_pwritev() wrapper
instead of manually wrapping the coroutine to simplify and save a
few lines.
* Adapt to changed interfaces for blk_{pread,pwrite}:
* a9262f551e ("block: Change blk_{pread,pwrite}() param order")
* 3b35d4542c ("block: Add a 'flags' param to blk_pread()")
* bf5b16fa40 ("block: Make blk_{pread,pwrite}() return 0 on success")
Those changes especially affected the qemu-img dd patches, because
the context also changed, but also some of our block drivers used
the functions.
* Drop qemu-common.h include: it got renamed after essentially
everything was moved to other headers. The only remaining user I
could find for things dropped from the header between 7.0 and 7.1
was qemu_get_vm_name() in the iscsi-initiatorname patch, but it
already includes the header to which the function was moved.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2022-10-14 15:07:13 +03:00
|
|
|
index a673302cce..fa424440bd 100644
|
2019-11-22 12:07:23 +03:00
|
|
|
--- a/hw/core/machine.c
|
|
|
|
|
+++ b/hw/core/machine.c
|
update submodule and patches to 7.1.0
Notable changes:
* The only big change is the switch to using a custom QIOChannel for
savevm-async, because the previously used QEMUFileOps was dropped.
Changes to the current implementation:
* Switch to vector based methods as required for an IO channel. For
short reads the passed-in IO vector is stuffed with zeroes at the
end, just to be sure.
* For reading: The documentation in include/io/channel.h states that
at least one byte should be read, so also error out when whe are
at the very end instead of returning 0.
* For reading: Fix off-by-one error when request goes beyond end.
The wrong code piece was:
if ((pos + size) > maxlen) {
size = maxlen - pos - 1;
}
Previously, the last byte would not be read. It's actually
possible to get a snapshot .raw file that has content all the way
up the final 512 byte (= BDRV_SECTOR_SIZE) boundary without any
trailing zero bytes (I wrote a script to do it).
Luckily, it didn't cause a real issue, because qemu_loadvm_state()
is not interested in the final (i.e. QEMU_VM_VMDESCRIPTION)
section. The buffer for reading it is simply freed up afterwards
and the function will assume that it read the whole section, even
if that's not the case.
* For writing: Make use of the generated blk_pwritev() wrapper
instead of manually wrapping the coroutine to simplify and save a
few lines.
* Adapt to changed interfaces for blk_{pread,pwrite}:
* a9262f551e ("block: Change blk_{pread,pwrite}() param order")
* 3b35d4542c ("block: Add a 'flags' param to blk_pread()")
* bf5b16fa40 ("block: Make blk_{pread,pwrite}() return 0 on success")
Those changes especially affected the qemu-img dd patches, because
the context also changed, but also some of our block drivers used
the functions.
* Drop qemu-common.h include: it got renamed after essentially
everything was moved to other headers. The only remaining user I
could find for things dropped from the header between 7.0 and 7.1
was qemu_get_vm_name() in the iscsi-initiatorname patch, but it
already includes the header to which the function was moved.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2022-10-14 15:07:13 +03:00
|
|
|
@@ -127,7 +127,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);
|