mirror of https://github.com/xemu-project/xemu.git
linux-user: Fix strace output for s390x mmap()
linux-user: Print tid not pid with strace -----BEGIN PGP SIGNATURE----- iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmdA59IdHHJpY2hhcmQu aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV+YfAf9E41MJqZhhtWIHJW7 z+mDw3Yr4Lgvmu2q3PmvOfM9YfvT3HFCh4gQRDaZbd3zy3c73S1/xSwBF2MQhElf Ml5mEUXtZGrK6Z/hq0QfS2mOGdwsydy+OpEtaw7YhVCMxMapnMi8rvSKe5XRpy/2 vragLVvJxISS6TnnJ/5RcnmajRLzgGIj7Ej4lbCyViOKhDPXMCr77+jOPHSxUt4R PQMPzUPJG8Y7j+YR4fQng6700XaqIu8hcn7o0RSghdWEvF+fPaJZDlF32V+yD2Jj sAvtRsiwLM54rycMJUrQ274IYPIhxyxlgWT0mIIb9fXYdYTHcpZ+ggQ/mSKg+8QQ 9tmsRg== =pR93 -----END PGP SIGNATURE----- Merge tag 'pull-lu-20241122' of https://gitlab.com/rth7680/qemu into staging linux-user: Fix strace output for s390x mmap() linux-user: Print tid not pid with strace # -----BEGIN PGP SIGNATURE----- # # iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmdA59IdHHJpY2hhcmQu # aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV+YfAf9E41MJqZhhtWIHJW7 # z+mDw3Yr4Lgvmu2q3PmvOfM9YfvT3HFCh4gQRDaZbd3zy3c73S1/xSwBF2MQhElf # Ml5mEUXtZGrK6Z/hq0QfS2mOGdwsydy+OpEtaw7YhVCMxMapnMi8rvSKe5XRpy/2 # vragLVvJxISS6TnnJ/5RcnmajRLzgGIj7Ej4lbCyViOKhDPXMCr77+jOPHSxUt4R # PQMPzUPJG8Y7j+YR4fQng6700XaqIu8hcn7o0RSghdWEvF+fPaJZDlF32V+yD2Jj # sAvtRsiwLM54rycMJUrQ274IYPIhxyxlgWT0mIIb9fXYdYTHcpZ+ggQ/mSKg+8QQ # 9tmsRg== # =pR93 # -----END PGP SIGNATURE----- # gpg: Signature made Fri 22 Nov 2024 20:21:38 GMT # gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F # gpg: issuer "richard.henderson@linaro.org" # gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full] # Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F * tag 'pull-lu-20241122' of https://gitlab.com/rth7680/qemu: linux-user: Fix strace output for s390x mmap() linux-user: Print tid not pid with strace Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
6b99bb046d
|
@ -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)
|
||||
#ifdef TARGET_ARCH_WANT_SYS_OLD_MMAP
|
||||
true
|
||||
#else
|
||||
false
|
||||
|
@ -4401,7 +4401,7 @@ print_syscall(CPUArchState *cpu_env, int num,
|
|||
if (!f) {
|
||||
return;
|
||||
}
|
||||
fprintf(f, "%d ", getpid());
|
||||
fprintf(f, "%d ", get_task_state(env_cpu(cpu_env))->ts_tid);
|
||||
|
||||
for (i = 0; i < nsyscalls; i++) {
|
||||
if (scnames[i].nr == num) {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -2766,4 +2766,11 @@ struct target_open_how_ver0 {
|
|||
#define RESOLVE_NO_SYMLINKS 0x04
|
||||
#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
|
||||
|
|
Loading…
Reference in New Issue