Accepting request 764410 from home:bfrogers:branches:Virtualization

- Fix xenfv migration from xen host with pre-v4.0 qemu (bsc#1159755)
  hw-i386-disable-smbus-migration-for-xenf.patch

OBS-URL: https://build.opensuse.org/request/show/764410
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=525

bundles.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b046fbeb4e300b898b61779b1b05f1c292e4f0ecedc1826298aa68f5f1440fd6
+oid sha256:a6556114711be59afb2bc4c87f4edbb71ab5a65f3b075c413c36b67aed707d17
-size 64960
+size 65560

hw-i386-disable-smbus-migration-for-xenf.patch

@@ -0,0 +1,38 @@
+From: Olaf Hering <olaf@aepfle.de>
+Date: Mon, 13 Jan 2020 18:45:21 +0100
+Subject: hw/i386: disable smbus migration for xenfv
+
+Git-commit: 0000000000000000000000000000000000000000
+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.
+Therefore this patch must be applied to stable-4.x as well.
+
+Signed-off-by: Olaf Hering <olaf@aepfle.de>
+[BR: changed patch as obtained from qemu-devel mailing list to reference
+xenfv, not xenpv, as Olaf indicated in followup email]
+Signed-off-by: Bruce Rogers <brogers@suse.com>
+---
+ hw/i386/pc_piix.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
+index d760d3589607daf4997ea76854c4..10d4972179a0dbe40aa9eaddf37e 100644
+--- a/hw/i386/pc_piix.c
++++ b/hw/i386/pc_piix.c
+@@ -1046,6 +1046,7 @@ static void xenfv_machine_options(MachineClass *m)
+     m->desc = "Xen Fully-virtualized PC";
+     m->max_cpus = HVM_MAX_VCPUS;
+     m->default_machine_opts = "accel=xen";
++    m->smbus_no_migration_support = true;
+ }
+ 
+ DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init,

qemu.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 14 18:10:53 UTC 2020 - Bruce Rogers <brogers@suse.com>
+
+- Fix xenfv migration from xen host with pre-v4.0 qemu (bsc#1159755)
+  hw-i386-disable-smbus-migration-for-xenf.patch
+
 -------------------------------------------------------------------
 Tue Jan 14 16:14:03 UTC 2020 - ohering@suse.de
 

qemu.spec

@@ -206,6 +206,7 @@ Patch00075:     roms-change-cross-compiler-naming-to-be-.patch
 Patch00076:     tests-Disable-some-block-tests-for-now.patch
 Patch00077:     test-add-mapping-from-arch-of-i686-to-qe.patch
 Patch00078:     roms-Makefile-enable-cross-compile-for-b.patch
+Patch00079:     hw-i386-disable-smbus-migration-for-xenf.patch
 # Patches applied in roms/seabios/:
 Patch01000:     seabios-use-python2-explicitly-as-needed.patch
 Patch01001:     seabios-switch-to-python3-as-needed.patch
@@ -991,6 +992,7 @@ This package provides a service file for starting and stopping KSM.
 %patch00076 -p1
 %patch00077 -p1
 %patch00078 -p1
+%patch00079 -p1
 %patch01000 -p1
 %patch01001 -p1
 %patch01002 -p1

target-i386-Add-missed-features-to-Coope.patch

@@ -2,7 +2,7 @@ From: Xiaoyao Li <xiaoyao.li@intel.com>
 Date: Wed, 8 Jan 2020 13:32:40 +0100
 Subject: target/i386: Add missed features to Cooperlake CPU model
 
-Git-commit: 0000000000000000000000000000000000000000
+Git-commit: 2dea9d9ca4ea7e9afe83d0b4153b21a16987e866
 References: jsc#SLE-7923
 
 It lacks VMX features and two security feature bits (disclosed recently) in

target-i386-Add-new-bit-definitions-of-M.patch

@@ -2,7 +2,7 @@ From: Xiaoyao Li <xiaoyao.li@intel.com>
 Date: Wed, 8 Jan 2020 13:32:39 +0100
 Subject: target/i386: Add new bit definitions of MSR_IA32_ARCH_CAPABILITIES
 
-Git-commit: 0000000000000000000000000000000000000000
+Git-commit: 6c997b4adb300788d61d72e2b8bc67c03a584956
 References: jsc#SLE-7923
 
 The bit 6, 7 and 8 of MSR_IA32_ARCH_CAPABILITIES are recently disclosed