diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-03-30 14:54:57 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-03-30 14:54:57 +0000 |
| commit | b9dbf6f9bf533564f6a4277d03906fcd32bb0245 (patch) | |
| tree | 48eace37b1dd58b83e6947072c07f4889bd3c461 /linux-user/strace.c | |
| parent | 10e637f47f18f7b5f8424a7417b7d9f34672ad81 (diff) | |
| parent | dafa0ecc97850c325fe85cd87dc0b536858d171a (diff) | |
| download | focaccia-qemu-b9dbf6f9bf533564f6a4277d03906fcd32bb0245.tar.gz focaccia-qemu-b9dbf6f9bf533564f6a4277d03906fcd32bb0245.zip | |
Merge tag 'pull-tcg-20240329' of https://gitlab.com/rth7680/qemu into staging
linux-user: Fix shmat(NULL) for host != guest page size tcg/optimize: Fix sign_mask for logical right-shift accel/tcg: Use CPUState.get_pc in cpu_io_recompile disas: Show opcodes for target_disas and monitor_disas # -----BEGIN PGP SIGNATURE----- # # iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmYHPmwdHHJpY2hhcmQu # aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV86VAf6AlcoLrvyN4u4bV4V # REIXe8y+IsqvNdNE6z1KRLdqbBzHHzlDD9TesX8QNmg1w8WxvBNg9Iv0cWeBgIyN # C/dpXVpNWbsfqtMLKIrBUkKiIyrQtxJC73HyoF0eqGftX5WxqYF/NCfXRHQFUdDP # wvGGq784IL4kLVMHX4fXB7Vmosei51cobnENo0b4A2fzDOGAFfQd38MSnPlL1+xb # BB+vV1hRFsf0Uihmvgk5AIdWlHxfqMWHq5rGV7ND26OTjZkOaPk3AeaX/eBCZd+8 # /gBd8Ok56WrVckz1hBMndRXwRjOQaowrNi1+vN3v6fqgNU227MaZ+hvvMCo7GSM7 # NhyQ9g== # =Y35A # -----END PGP SIGNATURE----- # gpg: Signature made Fri 29 Mar 2024 22:19:24 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-tcg-20240329' of https://gitlab.com/rth7680/qemu: accel/tcg: Use CPUState.get_pc in cpu_io_recompile disas: Show opcodes for target_disas and monitor_disas tcg/optimize: Fix sign_mask for logical right-shift tests/tcg: Test shmat(NULL) linux-user: Fix shmat(NULL) for h != g linux-user: Fix shmat() strace linux-user: Fix semctl() strace Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/strace.c')
| -rw-r--r-- | linux-user/strace.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/linux-user/strace.c b/linux-user/strace.c index 8d13e55a5b..b4d1098170 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -657,7 +657,6 @@ print_newselect(CPUArchState *cpu_env, const struct syscallname *name, } #endif -#ifdef TARGET_NR_semctl static void print_semctl(CPUArchState *cpu_env, const struct syscallname *name, abi_long arg1, abi_long arg2, abi_long arg3, @@ -668,7 +667,6 @@ print_semctl(CPUArchState *cpu_env, const struct syscallname *name, print_ipc_cmd(arg3); qemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4); } -#endif static void print_shmat(CPUArchState *cpu_env, const struct syscallname *name, @@ -698,14 +696,12 @@ print_ipc(CPUArchState *cpu_env, const struct syscallname *name, { switch(arg1) { case IPCOP_semctl: - qemu_log("semctl(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ",", - arg1, arg2); - print_ipc_cmd(arg3); - qemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4); + print_semctl(cpu_env, &(const struct syscallname){ .name = "semctl" }, + arg2, arg3, arg4, arg5, 0, 0); break; case IPCOP_shmat: print_shmat(cpu_env, &(const struct syscallname){ .name = "shmat" }, - arg1, arg4, arg2, 0, 0, 0); + arg2, arg5, arg3, 0, 0, 0); break; default: qemu_log(("%s(" |