From 58a130aa5fd1ea78bfe07ffd4b6bb8276a649ad3 Mon Sep 17 00:00:00 2001 From: "Danilo C. L. de Paula" Date: Wed, 12 Aug 2020 16:21:49 -0400 Subject: [PATCH] * Wed Aug 12 2020 Danilo Cesar Lemes de Paula - 5.1.0-2.el8 - kvm-redhat-define-hw_compat_8_2.patch [bz#1853265] - Resolves: bz#1853265 (Forward and backward migration from rhel-av-8.3.0(qemu-kvm-5.0.0) to rhel-av-8.2.1(qemu-kvm-4.2.0) failed with "qemu-kvm: error while loading state for instance 0x0 of device 'spapr'") --- kvm-redhat-define-hw_compat_8_2.patch | 47 +++++++++++++++++++++++++++ qemu-kvm.spec | 9 ++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 kvm-redhat-define-hw_compat_8_2.patch diff --git a/kvm-redhat-define-hw_compat_8_2.patch b/kvm-redhat-define-hw_compat_8_2.patch new file mode 100644 index 0000000..42bb6a4 --- /dev/null +++ b/kvm-redhat-define-hw_compat_8_2.patch @@ -0,0 +1,47 @@ +From 45b840275a5f5d3a3e4803c72c02a1db7fe1927d Mon Sep 17 00:00:00 2001 +From: Laurent Vivier +Date: Mon, 6 Jul 2020 09:41:16 +0000 +Subject: [PATCH] redhat: define hw_compat_8_2 + +RH-Author: Laurent Vivier +Message-id: <20200706104117.219174-2-lvivier@redhat.com> +Patchwork-id: 97903 +O-Subject: [RHEL-AV-8.3.0 qemu-kvm PATCH v2 1/2] redhat: define hw_compat_8_2 +Bugzilla: 1853265 +RH-Acked-by: David Gibson +RH-Acked-by: Thomas Huth +RH-Acked-by: Greg Kurz + +Signed-off-by: Laurent Vivier +Signed-off-by: Dr. David Alan Gilbert + For minor fix +Signed-off-by: Danilo C. L. de Paula +--- + hw/core/machine.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/hw/core/machine.c b/hw/core/machine.c +index 5476af98e1..6d17d9938d 100644 +--- a/hw/core/machine.c ++++ b/hw/core/machine.c +@@ -54,6 +54,17 @@ GlobalProperty hw_compat_rhel_8_2[] = { + { "qxl-vga", "revision", "4" }, + /* hw_compat_rhel_8_2 from hw_compat_4_2 */ + { "fw_cfg", "acpi-mr-restore", "false" }, ++ /* hw_compat_rhel_8_2 from hw_compat_5_0 */ ++ { "virtio-balloon-device", "page-poison", "false" }, ++ /* hw_compat_rhel_8_2 from hw_compat_5_0 */ ++ { "vmport", "x-read-set-eax", "off" }, ++ /* hw_compat_rhel_8_2 from hw_compat_5_0 */ ++ { "vmport", "x-signal-unsupported-cmd", "off" }, ++ /* hw_compat_rhel_8_2 from hw_compat_5_0 */ ++ { "vmport", "x-report-vmx-type", "off" }, ++ /* hw_compat_rhel_8_2 from hw_compat_5_0 */ ++ { "vmport", "x-cmds-v2", "off" }, ++ + }; + const size_t hw_compat_rhel_8_2_len = G_N_ELEMENTS(hw_compat_rhel_8_2); + /* +-- +2.27.0 + diff --git a/qemu-kvm.spec b/qemu-kvm.spec index 415c7c0..32fbb46 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -69,7 +69,7 @@ Obsoletes: %1-rhev Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 5.1.0 -Release: 1%{?dist} +Release: 2%{?dist} # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped Epoch: 15 License: GPLv2 and GPLv2+ and CC-BY @@ -138,6 +138,8 @@ Patch0033: 0033-vl-Remove-downstream-only-MAX_RHEL_CPUS-code.patch Patch0034: 0034-q35-Set-max_cpus-to-512.patch Patch0035: 0035-RHEL-only-arm-virt-Allow-the-TPM_TIS_SYSBUS-device-d.patch Patch0036: 0036-RHEL-only-Enable-vTPM-for-ARM-in-downstream-configs.patch +# For bz#1853265 - Forward and backward migration from rhel-av-8.3.0(qemu-kvm-5.0.0) to rhel-av-8.2.1(qemu-kvm-4.2.0) failed with "qemu-kvm: error while loading state for instance 0x0 of device 'spapr'" +Patch37: kvm-redhat-define-hw_compat_8_2.patch BuildRequires: wget BuildRequires: rpm-build @@ -1104,6 +1106,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Wed Aug 12 2020 Danilo Cesar Lemes de Paula - 5.1.0-2.el8 +- kvm-redhat-define-hw_compat_8_2.patch [bz#1853265] +- Resolves: bz#1853265 + (Forward and backward migration from rhel-av-8.3.0(qemu-kvm-5.0.0) to rhel-av-8.2.1(qemu-kvm-4.2.0) failed with "qemu-kvm: error while loading state for instance 0x0 of device 'spapr'") + * Wed Aug 12 2020 Danilo Cesar Lemes de Paula - 5.1.0-1.el8 - Quick changelog fix to reflect the current fixes: - Resolve: bz#1781911