motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-25 02:52:06 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux-user: Fix strace output for s390x mmap()

Browse source 
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: d971040c2d ("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>
This commit is contained in:
Ilya Leoshkevich 2024-11-20 22:26:44 +01:00 • committed by Richard Henderson
parent e8b609ac35
commit d95fd9838b
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
linux-user/strace.c
View file

@ -3971,7 +3971,7 @@ print_mmap(CPUArchState *cpu_env, const struct syscallname *name,
{ {
return print_mmap_both(cpu_env, name, arg0, arg1, arg2, arg3, return print_mmap_both(cpu_env, name, arg0, arg1, arg2, arg3,
arg4, arg5, arg4, arg5,
#if defined(TARGET_NR_mmap2) #ifdef TARGET_ARCH_WANT_SYS_OLD_MMAP
true true
#else #else
false false

5
linux-user/syscall.c
View file

@ -10588,10 +10588,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
return ret; return ret;
#ifdef TARGET_NR_mmap #ifdef TARGET_NR_mmap
case TARGET_NR_mmap: case TARGET_NR_mmap:
#if (defined(TARGET_I386) && defined(TARGET_ABI32)) || \ #ifdef TARGET_ARCH_WANT_SYS_OLD_MMAP
(defined(TARGET_ARM) && defined(TARGET_ABI32)) || \
defined(TARGET_M68K) || defined(TARGET_MICROBLAZE) \
|| defined(TARGET_S390X)
{ {
abi_ulong *v; abi_ulong *v;
abi_ulong v1, v2, v3, v4, v5, v6; abi_ulong v1, v2, v3, v4, v5, v6;

7
linux-user/syscall_defs.h
View file

@ -2766,4 +2766,11 @@ struct target_open_how_ver0 {
#define RESOLVE_NO_SYMLINKS 0x04 #define RESOLVE_NO_SYMLINKS 0x04
#endif #endif
#if (defined(TARGET_I386) && defined(TARGET_ABI32)) || \
(defined(TARGET_ARM) && defined(TARGET_ABI32)) || \
defined(TARGET_M68K) || defined(TARGET_MICROBLAZE) || \
defined(TARGET_S390X)
#define TARGET_ARCH_WANT_SYS_OLD_MMAP
#endif
#endif #endif