diff options
| author | Ilya Leoshkevich <iii@linux.ibm.com> | 2024-11-20 22:26:44 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-11-22 14:20:38 -0600 |
| commit | d95fd9838b540e69da9b07538ec8ad6ab9eab260 (patch) | |
| tree | 5a7969e255c8d57d98d94c25b82201a43f67b8c2 /linux-user/syscall.c | |
| parent | e8b609ac3598c44bba6535cd1306222eb4440bbb (diff) | |
| download | focaccia-qemu-d95fd9838b540e69da9b07538ec8ad6ab9eab260.tar.gz focaccia-qemu-d95fd9838b540e69da9b07538ec8ad6ab9eab260.zip | |
linux-user: Fix strace output for s390x mmap()
print_mmap() assumes that mmap() receives arguments via memory if
mmap2() is present. s390x (as opposed to s390) does not fit this
pattern: it does not have mmap2(), but mmap() still receives arguments
via memory.
Fix by sharing the detection logic between syscall.c and strace.c.
Cc: qemu-stable@nongnu.org
Fixes: d971040c2d16 ("linux-user: Fix strace output for old_mmap")
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-ID: <20241120212717.246186-1-iii@linux.ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'linux-user/syscall.c')
| -rw-r--r-- | linux-user/syscall.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 0279f23576..1ce4c79784 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -10588,10 +10588,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, return ret; #ifdef TARGET_NR_mmap case TARGET_NR_mmap: -#if (defined(TARGET_I386) && defined(TARGET_ABI32)) || \ - (defined(TARGET_ARM) && defined(TARGET_ABI32)) || \ - defined(TARGET_M68K) || defined(TARGET_MICROBLAZE) \ - || defined(TARGET_S390X) +#ifdef TARGET_ARCH_WANT_SYS_OLD_MMAP { abi_ulong *v; abi_ulong v1, v2, v3, v4, v5, v6; |