OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user: Fix semctl() strace

Browse Source 
The indices of arguments used with semctl() are all off-by-1, because
arg1 is the ipc() command. Fix them. While at it, reuse print_semctl().

New output (for a small test program):

    3540333 semctl(999,888,SEM_INFO,0x00007fe5051ee9a0) = -1 errno=14 (Bad address)

Fixes: 7ccfb2eb5f ("Fix warnings that would be caused by gcc flag -Wwrite-strings")
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-Id: <20240325192436.561154-2-iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Ilya Leoshkevich 2024-03-25 20:22:59 +01:00 committed by Richard Henderson
parent 5012e522ac
commit b9f38374ac
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linux-user/strace.c
View File

@ -657,7 +657,6 @@ print_newselect(CPUArchState *cpu_env, const struct syscallname *name,
} }
#endif #endif
#ifdef TARGET_NR_semctl
static void static void
print_semctl(CPUArchState *cpu_env, const struct syscallname *name, print_semctl(CPUArchState *cpu_env, const struct syscallname *name,
abi_long arg1, abi_long arg2, abi_long arg3, 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); print_ipc_cmd(arg3);
qemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4); qemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4);
} }
#endif
static void static void
print_shmat(CPUArchState *cpu_env, const struct syscallname *name, print_shmat(CPUArchState *cpu_env, const struct syscallname *name,
@ -698,10 +696,8 @@ print_ipc(CPUArchState *cpu_env, const struct syscallname *name,
{ {
switch(arg1) { switch(arg1) {
case IPCOP_semctl: case IPCOP_semctl:
qemu_log("semctl(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ",", print_semctl(cpu_env, &(const struct syscallname){ .name = "semctl" },
arg1, arg2); arg2, arg3, arg4, arg5, 0, 0);
print_ipc_cmd(arg3);
qemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4);
break; break;
case IPCOP_shmat: case IPCOP_shmat:
print_shmat(cpu_env, &(const struct syscallname){ .name = "shmat" }, print_shmat(cpu_env, &(const struct syscallname){ .name = "shmat" },