| Message ID | 20241119211138.148806-1-iii@linux.ibm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | linux-user: Fix strace output for s390x mmap() | expand |
On 11/19/24 15:11, Ilya Leoshkevich wrote: > 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 special-casing s390x. > > Cc: qemu-stable@nongnu.org > Fixes: d971040c2d16 ("linux-user: Fix strace output for old_mmap") > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > --- > linux-user/strace.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/linux-user/strace.c b/linux-user/strace.c > index b70eadc19ef..50f41e746ec 100644 > --- a/linux-user/strace.c > +++ b/linux-user/strace.c > @@ -3971,7 +3971,7 @@ print_mmap(CPUArchState *cpu_env, const struct syscallname *name, > { > return print_mmap_both(cpu_env, name, arg0, arg1, arg2, arg3, > arg4, arg5, > -#if defined(TARGET_NR_mmap2) > +#if defined(TARGET_NR_mmap2) || defined(TARGET_S390X) I think we should explicitly match syscalls.c: #if (defined(TARGET_I386) && defined(TARGET_ABI32)) || \ (defined(TARGET_ARM) && defined(TARGET_ABI32)) || \ defined(TARGET_M68K) || defined(TARGET_MICROBLAZE) \ || defined(TARGET_S390X) r~
diff --git a/linux-user/strace.c b/linux-user/strace.c index b70eadc19ef..50f41e746ec 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -3971,7 +3971,7 @@ print_mmap(CPUArchState *cpu_env, const struct syscallname *name, { return print_mmap_both(cpu_env, name, arg0, arg1, arg2, arg3, arg4, arg5, -#if defined(TARGET_NR_mmap2) +#if defined(TARGET_NR_mmap2) || defined(TARGET_S390X) true #else false
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 special-casing s390x. Cc: qemu-stable@nongnu.org Fixes: d971040c2d16 ("linux-user: Fix strace output for old_mmap") Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> --- linux-user/strace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)