From c5273992badb80ae8c401202a4e3f58b8be7de1c Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Sep 01 2021 16:48:27 +0000 Subject: Fix assertion on armv7hl https://bugzilla.redhat.com/show_bug.cgi?id=1999878 --- diff --git a/0001-target-i386-add-missing-bits-to-CR4_RESERVED_MASK.patch b/0001-target-i386-add-missing-bits-to-CR4_RESERVED_MASK.patch index 8ff4e30..225d3b4 100644 --- a/0001-target-i386-add-missing-bits-to-CR4_RESERVED_MASK.patch +++ b/0001-target-i386-add-missing-bits-to-CR4_RESERVED_MASK.patch @@ -1,7 +1,7 @@ -From f6ea43966cc3b739ba8cd9be20b141a1bad32a8e Mon Sep 17 00:00:00 2001 +From 45adec566b073b39f4edfc1307843d12fe8105c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 31 Aug 2021 18:50:33 +0100 -Subject: [PATCH] target/i386: add missing bits to CR4_RESERVED_MASK +Subject: [PATCH 1/2] target/i386: add missing bits to CR4_RESERVED_MASK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/0002-tcg-arm-Increase-stack-alignment-for-function-genera.patch b/0002-tcg-arm-Increase-stack-alignment-for-function-genera.patch new file mode 100644 index 0000000..645fbc4 --- /dev/null +++ b/0002-tcg-arm-Increase-stack-alignment-for-function-genera.patch @@ -0,0 +1,32 @@ +From 319935db129085bf4a3886dfd5662c687e6ce814 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Wed, 1 Sep 2021 17:12:20 +0100 +Subject: [PATCH 2/2] tcg/arm: Increase stack alignment for function generation + +This avoids the following assertion when the kernel initializes X.509 +certificates: + +[ 7.315373] Loading compiled-in X.509 certificates +qemu-system-arm: ../tcg/tcg.c:3063: temp_allocate_frame: Assertion `align <= TCG_TARGET_STACK_ALIGN' failed. + +Signed-off-by: Richard W.M. Jones +--- + tcg/arm/tcg-target.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h +index d113b7f8db..5c8f3f8c55 100644 +--- a/tcg/arm/tcg-target.h ++++ b/tcg/arm/tcg-target.h +@@ -115,7 +115,7 @@ extern bool use_neon_instructions; + #endif + + /* used for function call generation */ +-#define TCG_TARGET_STACK_ALIGN 8 ++#define TCG_TARGET_STACK_ALIGN 16 + #define TCG_TARGET_CALL_ALIGN_ARGS 1 + #define TCG_TARGET_CALL_STACK_OFFSET 0 + +-- +2.32.0 + diff --git a/qemu.spec b/qemu.spec index 9689b84..85bf2f9 100644 --- a/qemu.spec +++ b/qemu.spec @@ -282,7 +282,7 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} Summary: QEMU is a FAST! processor emulator Name: qemu Version: 6.1.0 -Release: 5%{?rcrel}%{?dist} +Release: 6%{?rcrel}%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -304,6 +304,10 @@ Source36: README.tests # https://bugzilla.redhat.com/show_bug.cgi?id=1999700 Patch1: 0001-target-i386-add-missing-bits-to-CR4_RESERVED_MASK.patch +# Fix assertion on armv7hl +# https://bugzilla.redhat.com/show_bug.cgi?id=1999878 +Patch2: 0002-tcg-arm-Increase-stack-alignment-for-function-genera.patch + BuildRequires: meson >= %{meson_version} BuildRequires: zlib-devel BuildRequires: glib2-devel @@ -2232,6 +2236,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Wed Sep 01 2021 Richard W.M. Jones - 6.1.0-6 +- Fix assertion on armv7hl (RHBZ#1999878) + * Tue Aug 31 2021 Richard W.M. Jones - 6.1.0-5 - Fix -cpu max (RHBZ#1999700)