File hw-i386-disable-smbus-migration-for-xenf.patch of Package qemu.15631

Overview Repositories Revisions Requests Users Attributes Meta

File hw-i386-disable-smbus-migration-for-xenf.patch of Package qemu.15631

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";

Places

File hw-i386-disable-smbus-migration-for-xenf.patch of Package qemu.15631

Places