rpms
/
qemu
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for s390x emulation breaking Python (RHBZ#2080519)

This commit is contained in:
Richard W.M. Jones 2022-05-05 13:07:46 +01:00
parent de31087629
commit a9028c06ad
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0001-accel-tcg-Fix-cpu_ldq_be_mmu-typo.patch Normal file
View File

@ -0,0 +1,38 @@
From 46697cb96e1cc6c3f1edbe572cee1ce9ac97cc58 Mon Sep 17 00:00:00 2001
From: Richard Henderson <richard.henderson@linaro.org>
Date: Mon, 14 Mar 2022 17:25:06 -0700
Subject: [PATCH] accel/tcg: Fix cpu_ldq_be_mmu typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In the conversion to cpu_ld_*_mmu, the retaddr parameter
was corrupted in the one case of cpu_ldq_be_mmu.
Fixes: f83bcecb1 ("accel/tcg: Add cpu_{ld,st}*_mmu interfaces")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/902
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220315002506.152030-1-richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
accel/tcg/cputlb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 3b918fe018..2035b2ac0a 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -2174,7 +2174,7 @@ uint32_t cpu_ldl_be_mmu(CPUArchState *env, abi_ptr addr,
uint64_t cpu_ldq_be_mmu(CPUArchState *env, abi_ptr addr,
MemOpIdx oi, uintptr_t ra)
{
- return cpu_load_helper(env, addr, oi, MO_BEQ, helper_be_ldq_mmu);
+ return cpu_load_helper(env, addr, oi, ra, helper_be_ldq_mmu);
}
uint16_t cpu_ldw_le_mmu(CPUArchState *env, abi_ptr addr,
--
2.35.1

9
qemu.spec
View File

@ -302,7 +302,7 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release}
%endif
# To prevent rpmdev-bumpspec breakage
%global baserelease 8
%global baserelease 9
Summary: QEMU is a FAST! processor emulator
Name: qemu
@ -340,6 +340,10 @@ Patch0004: 0002-virtiofsd-Do-not-support-blocking-flock.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=2072303
Patch0005: 0001-acpi-fix-QEMU-crash-when-started-with-SLIC-table.patch
# Fix for s390x emulation breaking Python
# https://bugzilla.redhat.com/show_bug.cgi?id=2080519
Patch0006: 0001-accel-tcg-Fix-cpu_ldq_be_mmu-typo.patch
BuildRequires: meson >= %{meson_version}
BuildRequires: zlib-devel
BuildRequires: glib2-devel
@ -2305,6 +2309,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
%changelog
* Thu May 05 2022 Richard W.M. Jones <rjones@redhat.com> - 2:6.2.0-9
- Fix for s390x emulation breaking Python (RHBZ#2080519)
* Wed Apr 06 2022 Richard W.M. Jones <rjones@redhat.com> - 2:6.2.0-8
- acpi: fix QEMU crash when started with SLIC table (RHBZ#2072303)