7325eaecfb
- Include upstream patches targeted for the next stable release (bug fixes only) spapr-Fix-failure-path-for-attempting-to.patch target-i386-do-not-set-unsupported-VMX-s.patch target-xtensa-fix-pasto-in-pfwait.r-opco.patch tcg-i386-Fix-INDEX_op_dup2_vec.patch tcg-mips-mips-sync-encode-error.patch vhost-user-gpu-Release-memory-returned-b.patch vpc-Don-t-round-up-already-aligned-BAT-s.patch xen-block-Fix-double-qlist-remove-and-re.patch - Fix bug causing weak encryption in PAuth for ARM (CVE-2020-10702 bsc#1168681) target-arm-Fix-PAuth-sbox-functions.patch - Fix OOB in tulip NIC emulation (CVE-2020-11102 bsc#1168713 net-tulip-check-frame-size-and-r-w-data-.patch - Note that previously included patch addresses CVE-2020-1711 and bsc#1166240 iscsi-Cap-block-count-from-GET-LBA-STATU.patch - Include performance improvement (and related?) patch aio-wait-delegate-polling-of-main-AioCon.patch async-use-explicit-memory-barriers.patch - Rework previous patch at Olaf H.'s direction hw-i386-disable-smbus-migration-for-xenf.patch - Eliminate is_opensuse usage in producing seabios version string what we are doing here is just replacing the upstream string with one indicating that the openSUSE build service built it, and so just leave it as "-rebuilt.opensuse.org" - Alter algorithm used to produce "unique" symbol for coordinating qemu with the optional modules it may load. This is a reasonable relaxation for broader compatibility configure-remove-pkgversion-from-CONFIG_.patch - Tweak supported.*.txt for latest deprecations, and other fixes - Tweak update_git.sh, config.sh - One more fix is needed for: s390x Protected Virtualization support - start and control guest in secure mode (bsc#1167075 jsc#SLE-7407) s390x-s390-virtio-ccw-Fix-build-on-syste.patch OBS-URL: https://build.opensuse.org/request/show/795118 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=542
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From: Olaf Hering <olaf@aepfle.de>
|
|
Date: Wed, 19 Feb 2020 15:15:15 +0100
|
|
Subject: hw/i386: disable smbus migration for xenfv
|
|
|
|
References: bsc#1159755
|
|
|
|
With commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea a new member
|
|
smbus_no_migration_support was added, and enabled in two places.
|
|
With commit 4ab2f2a8aabfea95cc53c64e13b3f67960b27fdf the vmstate_acpi
|
|
got new elements, which are conditionally filled. As a result, an
|
|
incoming migration expected smbus related data unless smbus migration
|
|
was disabled for a given MachineClass.
|
|
|
|
Since commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea forgot to handle
|
|
xenfv, live migration to receiving hosts using qemu-4.0 and later is broken.
|
|
|
|
Adjust 'xenfv' to stay compatible with with 'pc-i440fx-3.1':
|
|
- the toolstack can not use '-M pc-i440fx-3.1,accel=xen -device xen-platform'
|
|
because this would move the PCI device from 00:02.0 to 00:04.0
|
|
- disable pvh.
|
|
Running PVH may require dedicated device_model_args= options which select
|
|
'pc-i440fx-4.x'
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
[BR: Adjust implementation to simply call pc_i440fx_3_1_machine_options]
|
|
---
|
|
hw/i386/pc_piix.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
index d760d3589607daf4997ea76854c4..000e692d0e5af449270214ea9345 100644
|
|
--- a/hw/i386/pc_piix.c
|
|
+++ b/hw/i386/pc_piix.c
|
|
@@ -1043,6 +1043,8 @@ DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa,
|
|
#ifdef CONFIG_XEN
|
|
static void xenfv_machine_options(MachineClass *m)
|
|
{
|
|
+ /* compat with pc_i440fx_3_1_machine_options */
|
|
+ pc_i440fx_3_1_machine_options(m);
|
|
m->desc = "Xen Fully-virtualized PC";
|
|
m->max_cpus = HVM_MAX_VCPUS;
|
|
m->default_machine_opts = "accel=xen";
|