From 915cb810bee63c39054093e3efba7a0f63241e0a Mon Sep 17 00:00:00 2001 From: "Danilo C. L. de Paula" Date: Wed, 19 Aug 2020 13:01:59 -0400 Subject: [PATCH] * Wed Aug 19 2020 Danilo Cesar Lemes de Paula - 5.1.0-3.el8 - kvm-redhat-Update-hw_compat_8_2.patch [bz#1843348] - kvm-redhat-update-pseries-rhel8.2.0-machine-type.patch [bz#1843348] - kvm-Disable-TPM-passthrough-backend-on-ARM.patch [bz#1801242] - kvm-Require-libfdt-1.6.0.patch [bz#1867847] - Resolves: bz#1801242 ([aarch64] vTPM support in machvirt) - Resolves: bz#1843348 (8.3 machine types for POWER) - Resolves: bz#1867847 ([ppc] virt module 7629: /usr/libexec/qemu-kvm: undefined symbol: fdt_check_full, version LIBFDT_1.2) --- ...sable-TPM-passthrough-backend-on-ARM.patch | 44 +++++++++++++ kvm-redhat-Update-hw_compat_8_2.patch | 64 +++++++++++++++++++ ...pdate-pseries-rhel8.2.0-machine-type.patch | 58 +++++++++++++++++ qemu-kvm.spec | 24 ++++++- 4 files changed, 188 insertions(+), 2 deletions(-) create mode 100644 kvm-Disable-TPM-passthrough-backend-on-ARM.patch create mode 100644 kvm-redhat-Update-hw_compat_8_2.patch create mode 100644 kvm-redhat-update-pseries-rhel8.2.0-machine-type.patch diff --git a/kvm-Disable-TPM-passthrough-backend-on-ARM.patch b/kvm-Disable-TPM-passthrough-backend-on-ARM.patch new file mode 100644 index 0000000..59f9ffb --- /dev/null +++ b/kvm-Disable-TPM-passthrough-backend-on-ARM.patch @@ -0,0 +1,44 @@ +From 4a8ccfdf57fb0e0835faef9d95939d31546202f8 Mon Sep 17 00:00:00 2001 +From: Auger Eric +Date: Wed, 19 Aug 2020 09:16:03 -0400 +Subject: [PATCH 3/4] Disable TPM passthrough backend on ARM +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +RH-Author: Auger Eric +Message-id: <20200819091603.23319-1-eric.auger@redhat.com> +Patchwork-id: 98190 +O-Subject: [RHEL-AV-8.3.0 qemu-kvm PATCH] Disable TPM passthrough backend on ARM +Bugzilla: 1801242 +RH-Acked-by: Laszlo Ersek +RH-Acked-by: Philippe Mathieu-Daudé +RH-Acked-by: Andrew Jones + +BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1801242 +UPSTREAM: not applicable +BRANCH: rhel-av-8.3.0 +BREW: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=30820412 + +Let's disable the TPM passthrough backend on ARM as this looks +to be a marginal use case and it was not tested comprehensively yet. + +Signed-off-by: Eric Auger +Signed-off-by: Danilo C. L. de Paula +--- + default-configs/aarch64-rh-devices.mak | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/default-configs/aarch64-rh-devices.mak b/default-configs/aarch64-rh-devices.mak +index 0b6a03f816..6a597384ea 100644 +--- a/default-configs/aarch64-rh-devices.mak ++++ b/default-configs/aarch64-rh-devices.mak +@@ -21,5 +21,4 @@ CONFIG_XIO3130=y + CONFIG_NVDIMM=y + CONFIG_ACPI_APEI=y + CONFIG_TPM_EMULATOR=y +-CONFIG_TPM_PASSTHROUGH=y + CONFIG_TPM_TIS_SYSBUS=y +-- +2.27.0 + diff --git a/kvm-redhat-Update-hw_compat_8_2.patch b/kvm-redhat-Update-hw_compat_8_2.patch new file mode 100644 index 0000000..f4a096f --- /dev/null +++ b/kvm-redhat-Update-hw_compat_8_2.patch @@ -0,0 +1,64 @@ +From 4effa711a867eaf0f10b38c2bcf4c8c39a00c1ab Mon Sep 17 00:00:00 2001 +From: Laurent Vivier +Date: Fri, 14 Aug 2020 16:02:48 -0400 +Subject: [PATCH 1/4] redhat: Update hw_compat_8_2 + +RH-Author: Laurent Vivier +Message-id: <20200814160249.217753-2-lvivier@redhat.com> +Patchwork-id: 98157 +O-Subject: [RHEL-AV-8.3.0 qemu-kvm PATCH 1/2] redhat: Update hw_compat_8_2 +Bugzilla: 1843348 +RH-Acked-by: Dr. David Alan Gilbert +RH-Acked-by: Cornelia Huck +RH-Acked-by: David Gibson + +v5.1.0-rc2 has introduced a new entry in hw_compat_5_0: + 2ebc21216f58 ("hw/pci-host: save/restore pci host config register") + +Add it in hw_compat_rhel_8_2 + +Update hw_compat_8_2 comment as it also includes hw_compat_5_0 +Move a blank line + +Signed-off-by: Laurent Vivier +Signed-off-by: Danilo C. L. de Paula +--- + hw/core/machine.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/hw/core/machine.c b/hw/core/machine.c +index 6d17d9938d..10fa9b8c75 100644 +--- a/hw/core/machine.c ++++ b/hw/core/machine.c +@@ -29,7 +29,7 @@ + #include "migration/vmstate.h" + + /* +- * The same as hw_compat_4_2 ++ * The same as hw_compat_4_2 + hw_compat_5_0 + */ + GlobalProperty hw_compat_rhel_8_2[] = { + /* hw_compat_rhel_8_2 from hw_compat_4_2 */ +@@ -55,6 +55,8 @@ GlobalProperty hw_compat_rhel_8_2[] = { + /* 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 */ ++ { "pci-host-bridge", "x-config-reg-migration-enabled", "off" }, ++ /* 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" }, +@@ -64,9 +66,9 @@ GlobalProperty hw_compat_rhel_8_2[] = { + { "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); ++ + /* + * The same as hw_compat_4_1 + */ +-- +2.27.0 + diff --git a/kvm-redhat-update-pseries-rhel8.2.0-machine-type.patch b/kvm-redhat-update-pseries-rhel8.2.0-machine-type.patch new file mode 100644 index 0000000..45f4e77 --- /dev/null +++ b/kvm-redhat-update-pseries-rhel8.2.0-machine-type.patch @@ -0,0 +1,58 @@ +From 1ab8783e716eb5ae2fb44b06a2db16b9fb91dad9 Mon Sep 17 00:00:00 2001 +From: Laurent Vivier +Date: Fri, 14 Aug 2020 16:02:49 -0400 +Subject: [PATCH 2/4] redhat: update pseries-rhel8.2.0 machine type + +RH-Author: Laurent Vivier +Message-id: <20200814160249.217753-3-lvivier@redhat.com> +Patchwork-id: 98156 +O-Subject: [RHEL-AV-8.3.0 qemu-kvm PATCH 2/2] redhat: update pseries-rhel8.2.0 machine type +Bugzilla: 1843348 +RH-Acked-by: Dr. David Alan Gilbert +RH-Acked-by: Cornelia Huck +RH-Acked-by: David Gibson + +v5.1.0-rc1 has modified the default state of pseries-5.1 and +introduced a new entry in pseries-5.0 machine type: + a6030d7e0b35 ("spapr: Add a new level of NUMA for GPUs") + +Add this entry to pseries-rhel8.2.0 as the default state has +also changed for pseries-rhel8.3.0 + +Signed-off-by: Laurent Vivier +Signed-off-by: Danilo C. L. de Paula +--- + hw/ppc/spapr.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c +index 1c367a2367..5e3964326d 100644 +--- a/hw/ppc/spapr.c ++++ b/hw/ppc/spapr.c +@@ -5019,10 +5019,15 @@ DEFINE_SPAPR_MACHINE(rhel830, "rhel8.3.0", true); + static void spapr_machine_rhel820_class_options(MachineClass *mc) + { + SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc); ++ /* from pseries-5.0 */ ++ static GlobalProperty compat[] = { ++ { TYPE_SPAPR_PCI_HOST_BRIDGE, "pre-5.1-associativity", "on" }, ++ }; + + spapr_machine_rhel830_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_rhel_8_2, + hw_compat_rhel_8_2_len); ++ compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); + + /* from pseries-4.2 */ + smc->default_caps.caps[SPAPR_CAP_FWNMI] = SPAPR_CAP_OFF; +@@ -5031,6 +5036,7 @@ static void spapr_machine_rhel820_class_options(MachineClass *mc) + + /* from pseries-5.0 */ + mc->numa_mem_supported = true; ++ smc->pre_5_1_assoc_refpoints = true; + } + + DEFINE_SPAPR_MACHINE(rhel820, "rhel8.2.0", false); +-- +2.27.0 + diff --git a/qemu-kvm.spec b/qemu-kvm.spec index 32fbb46..e32e40f 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: 2%{?dist} +Release: 3%{?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 @@ -140,6 +140,12 @@ 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 +# For bz#1843348 - 8.3 machine types for POWER +Patch38: kvm-redhat-Update-hw_compat_8_2.patch +# For bz#1843348 - 8.3 machine types for POWER +Patch39: kvm-redhat-update-pseries-rhel8.2.0-machine-type.patch +# For bz#1801242 - [aarch64] vTPM support in machvirt +Patch40: kvm-Disable-TPM-passthrough-backend-on-ARM.patch BuildRequires: wget BuildRequires: rpm-build @@ -206,7 +212,6 @@ BuildRequires: rdma-core-devel %endif %if %{have_fdt} BuildRequires: libfdt-devel >= 1.6.0 -Requires: libfdt >= 1.6.0 %endif # iasl and cpp for acpi generation (not a hard requirement as we can use # pre-compiled files, but it's better to use this) @@ -303,6 +308,9 @@ Requires: libusbx >= 1.0.19 %if %{have_usbredir} Requires: usbredir >= 0.7.1 %endif +%if %{have_fdt} +Requires: libfdt >= 1.6.0 +%endif %rhev_ma_conflicts qemu-kvm @@ -1106,6 +1114,18 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Wed Aug 19 2020 Danilo Cesar Lemes de Paula - 5.1.0-3.el8 +- kvm-redhat-Update-hw_compat_8_2.patch [bz#1843348] +- kvm-redhat-update-pseries-rhel8.2.0-machine-type.patch [bz#1843348] +- kvm-Disable-TPM-passthrough-backend-on-ARM.patch [bz#1801242] +- kvm-Require-libfdt-1.6.0.patch [bz#1867847] +- Resolves: bz#1801242 + ([aarch64] vTPM support in machvirt) +- Resolves: bz#1843348 + (8.3 machine types for POWER) +- Resolves: bz#1867847 + ([ppc] virt module 7629: /usr/libexec/qemu-kvm: undefined symbol: fdt_check_full, version LIBFDT_1.2) + * 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