* [PATCH v3] linux-user/strace: Improve output of various syscalls
@ 2019-11-21 19:33 Helge Deller
2019-11-21 19:40 ` Aleksandar Markovic
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Helge Deller @ 2019-11-21 19:33 UTC (permalink / raw)
To: qemu-devel, Aleksandar Markovic
Cc: Richard Henderson, Philippe Mathieu-Daudé, Laurent Vivier
Improve strace output of various syscalls which either have none
or only int-type parameters.
Signed-off-by: Helge Deller <deller@gmx.de>
---
Changes in v3:
fixed alarm()
added epoll_create(), epoll_create1(), eventfd(), eventfd2()
Changes in v2:
fixed ioctl()
diff --git a/linux-user/strace.list b/linux-user/strace.list
index 1de4319dcf..d49a1e92a8 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -26,7 +26,7 @@
{ TARGET_NR_afs_syscall, "afs_syscall" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_alarm
-{ TARGET_NR_alarm, "alarm" , NULL, NULL, NULL },
+{ TARGET_NR_alarm, "alarm" , "%s(%u)", NULL, NULL },
#endif
#ifdef TARGET_NR_aplib
{ TARGET_NR_aplib, "aplib" , NULL, NULL, NULL },
@@ -116,19 +116,19 @@
{ TARGET_NR_dipc, "dipc" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_dup
-{ TARGET_NR_dup, "dup" , NULL, NULL, NULL },
+{ TARGET_NR_dup, "dup" , "%s(%d)", NULL, NULL },
#endif
#ifdef TARGET_NR_dup2
-{ TARGET_NR_dup2, "dup2" , NULL, NULL, NULL },
+{ TARGET_NR_dup2, "dup2" , "%s(%d,%d)", NULL, NULL },
#endif
#ifdef TARGET_NR_dup3
-{ TARGET_NR_dup3, "dup3" , NULL, NULL, NULL },
+{ TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL },
#endif
#ifdef TARGET_NR_epoll_create
-{ TARGET_NR_epoll_create, "epoll_create" , NULL, NULL, NULL },
+{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_epoll_create1
-{ TARGET_NR_epoll_create1, "epoll_create1" , NULL, NULL, NULL },
+{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_epoll_ctl
{ TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL },
@@ -146,10 +146,10 @@
{ TARGET_NR_epoll_wait_old, "epoll_wait_old" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_eventfd
-{ TARGET_NR_eventfd, "eventfd" , NULL, NULL, NULL },
+{ TARGET_NR_eventfd, "eventfd", "%s(%d)", NULL, NULL },
#endif
#ifdef TARGET_NR_eventfd2
-{ TARGET_NR_eventfd2, "eventfd2" , NULL, NULL, NULL },
+{ TARGET_NR_eventfd2, "eventfd2" , "%s(%d,%d)", NULL, NULL },
#endif
#ifdef TARGET_NR_execv
{ TARGET_NR_execv, "execv" , NULL, print_execv, NULL },
@@ -191,7 +191,7 @@
{ TARGET_NR_fanotify_mark, "fanotify_mark" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_fchdir
-{ TARGET_NR_fchdir, "fchdir" , NULL, NULL, NULL },
+{ TARGET_NR_fchdir, "fchdir" , "%s(%d)", NULL, NULL },
#endif
#ifdef TARGET_NR_fchmod
{ TARGET_NR_fchmod, "fchmod" , "%s(%d,%#o)", NULL, NULL },
@@ -287,7 +287,7 @@
{ TARGET_NR_getdtablesize, "getdtablesize" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_getegid
-{ TARGET_NR_getegid, "getegid" , NULL, NULL, NULL },
+{ TARGET_NR_getegid, "getegid" , "%s()", NULL, NULL },
#endif
#ifdef TARGET_NR_getegid32
{ TARGET_NR_getegid32, "getegid32" , NULL, NULL, NULL },
@@ -299,7 +299,7 @@
{ TARGET_NR_geteuid32, "geteuid32" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_getgid
-{ TARGET_NR_getgid, "getgid" , NULL, NULL, NULL },
+{ TARGET_NR_getgid, "getgid" , "%s()", NULL, NULL },
#endif
#ifdef TARGET_NR_getgid32
{ TARGET_NR_getgid32, "getgid32" , NULL, NULL, NULL },
@@ -329,10 +329,10 @@
{ TARGET_NR_getpeername, "getpeername" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_getpgid
-{ TARGET_NR_getpgid, "getpgid" , NULL, NULL, NULL },
+{ TARGET_NR_getpgid, "getpgid" , "%s(%u)", NULL, NULL },
#endif
#ifdef TARGET_NR_getpgrp
-{ TARGET_NR_getpgrp, "getpgrp" , NULL, NULL, NULL },
+{ TARGET_NR_getpgrp, "getpgrp" , "%s()", NULL, NULL },
#endif
#ifdef TARGET_NR_getpid
{ TARGET_NR_getpid, "getpid" , "%s()", NULL, NULL },
@@ -432,7 +432,7 @@
{ TARGET_NR_io_cancel, "io_cancel" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_ioctl
-{ TARGET_NR_ioctl, "ioctl" , NULL, NULL, NULL },
+{ TARGET_NR_ioctl, "ioctl" , "%s(%d,%#x,%#x)", NULL, NULL },
#endif
#ifdef TARGET_NR_io_destroy
{ TARGET_NR_io_destroy, "io_destroy" , NULL, NULL, NULL },
@@ -1257,22 +1257,22 @@
{ TARGET_NR_setdomainname, "setdomainname" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_setfsgid
-{ TARGET_NR_setfsgid, "setfsgid" , NULL, NULL, NULL },
+{ TARGET_NR_setfsgid, "setfsgid" , "%s(%u)", NULL, NULL },
#endif
#ifdef TARGET_NR_setfsgid32
-{ TARGET_NR_setfsgid32, "setfsgid32" , NULL, NULL, NULL },
+{ TARGET_NR_setfsgid32, "setfsgid32" , "%s(%u)" , NULL, NULL },
#endif
#ifdef TARGET_NR_setfsuid
-{ TARGET_NR_setfsuid, "setfsuid" , NULL, NULL, NULL },
+{ TARGET_NR_setfsuid, "setfsuid" , "%s(%u)" , NULL, NULL },
#endif
#ifdef TARGET_NR_setfsuid32
{ TARGET_NR_setfsuid32, "setfsuid32" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_setgid
-{ TARGET_NR_setgid, "setgid" , NULL, NULL, NULL },
+{ TARGET_NR_setgid, "setgid" , "%s(%u)", NULL, NULL },
#endif
#ifdef TARGET_NR_setgid32
-{ TARGET_NR_setgid32, "setgid32" , NULL, NULL, NULL },
+{ TARGET_NR_setgid32, "setgid32" , "%s(%u)", NULL, NULL },
#endif
#ifdef TARGET_NR_setgroups
{ TARGET_NR_setgroups, "setgroups" , NULL, NULL, NULL },
@@ -1296,7 +1296,7 @@
{ TARGET_NR_setns, "setns" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_setpgid
-{ TARGET_NR_setpgid, "setpgid" , NULL, NULL, NULL },
+{ TARGET_NR_setpgid, "setpgid" , "%s(%u,%u)", NULL, NULL },
#endif
#ifdef TARGET_NR_setpgrp
{ TARGET_NR_setpgrp, "setpgrp" , NULL, NULL, NULL },
@@ -1311,22 +1311,22 @@
{ TARGET_NR_setregid32, "setregid32" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_setresgid
-{ TARGET_NR_setresgid, "setresgid" , NULL, NULL, NULL },
+{ TARGET_NR_setresgid, "setresgid" , "%s(%u,%u,%u)", NULL, NULL },
#endif
#ifdef TARGET_NR_setresgid32
{ TARGET_NR_setresgid32, "setresgid32" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_setresuid
-{ TARGET_NR_setresuid, "setresuid" , NULL, NULL, NULL },
+{ TARGET_NR_setresuid, "setresuid" , "%s(%u,%u,%u)", NULL, NULL },
#endif
#ifdef TARGET_NR_setresuid32
-{ TARGET_NR_setresuid32, "setresuid32" , NULL, NULL, NULL },
+{ TARGET_NR_setresuid32, "setresuid32" , "%s(%u,%u,%u)", NULL, NULL },
#endif
#ifdef TARGET_NR_setreuid
-{ TARGET_NR_setreuid, "setreuid" , NULL, NULL, NULL },
+{ TARGET_NR_setreuid, "setreuid" , "%s(%u,%u)", NULL, NULL },
#endif
#ifdef TARGET_NR_setreuid32
-{ TARGET_NR_setreuid32, "setreuid32" , NULL, NULL, NULL },
+{ TARGET_NR_setreuid32, "setreuid32" , "%s(%u,%u)", NULL, NULL },
#endif
#ifdef TARGET_NR_setrlimit
{ TARGET_NR_setrlimit, "setrlimit" , NULL, NULL, NULL },
@@ -1335,7 +1335,7 @@
{ TARGET_NR_set_robust_list, "set_robust_list" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_setsid
-{ TARGET_NR_setsid, "setsid" , NULL, NULL, NULL },
+{ TARGET_NR_setsid, "setsid" , "%s()", NULL, NULL },
#endif
#ifdef TARGET_NR_setsockopt
{ TARGET_NR_setsockopt, "setsockopt" , NULL, NULL, NULL },
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3] linux-user/strace: Improve output of various syscalls
2019-11-21 19:33 [PATCH v3] linux-user/strace: Improve output of various syscalls Helge Deller
@ 2019-11-21 19:40 ` Aleksandar Markovic
2019-11-22 10:54 ` Philippe Mathieu-Daudé
2020-02-18 19:57 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Aleksandar Markovic @ 2019-11-21 19:40 UTC (permalink / raw)
To: Helge Deller
Cc: Laurent Vivier, Richard Henderson, QEMU Developers,
Philippe Mathieu-Daudé
On Thu, Nov 21, 2019 at 8:33 PM Helge Deller <deller@gmx.de> wrote:
>
> Improve strace output of various syscalls which either have none
> or only int-type parameters.
>
> Signed-off-by: Helge Deller <deller@gmx.de>
>
> ---
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
> Changes in v3:
> fixed alarm()
> added epoll_create(), epoll_create1(), eventfd(), eventfd2()
>
> Changes in v2:
> fixed ioctl()
>
>
> diff --git a/linux-user/strace.list b/linux-user/strace.list
> index 1de4319dcf..d49a1e92a8 100644
> --- a/linux-user/strace.list
> +++ b/linux-user/strace.list
> @@ -26,7 +26,7 @@
> { TARGET_NR_afs_syscall, "afs_syscall" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_alarm
> -{ TARGET_NR_alarm, "alarm" , NULL, NULL, NULL },
> +{ TARGET_NR_alarm, "alarm" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_aplib
> { TARGET_NR_aplib, "aplib" , NULL, NULL, NULL },
> @@ -116,19 +116,19 @@
> { TARGET_NR_dipc, "dipc" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_dup
> -{ TARGET_NR_dup, "dup" , NULL, NULL, NULL },
> +{ TARGET_NR_dup, "dup" , "%s(%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_dup2
> -{ TARGET_NR_dup2, "dup2" , NULL, NULL, NULL },
> +{ TARGET_NR_dup2, "dup2" , "%s(%d,%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_dup3
> -{ TARGET_NR_dup3, "dup3" , NULL, NULL, NULL },
> +{ TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_epoll_create
> -{ TARGET_NR_epoll_create, "epoll_create" , NULL, NULL, NULL },
> +{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_epoll_create1
> -{ TARGET_NR_epoll_create1, "epoll_create1" , NULL, NULL, NULL },
> +{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_epoll_ctl
> { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL },
> @@ -146,10 +146,10 @@
> { TARGET_NR_epoll_wait_old, "epoll_wait_old" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_eventfd
> -{ TARGET_NR_eventfd, "eventfd" , NULL, NULL, NULL },
> +{ TARGET_NR_eventfd, "eventfd", "%s(%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_eventfd2
> -{ TARGET_NR_eventfd2, "eventfd2" , NULL, NULL, NULL },
> +{ TARGET_NR_eventfd2, "eventfd2" , "%s(%d,%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_execv
> { TARGET_NR_execv, "execv" , NULL, print_execv, NULL },
> @@ -191,7 +191,7 @@
> { TARGET_NR_fanotify_mark, "fanotify_mark" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_fchdir
> -{ TARGET_NR_fchdir, "fchdir" , NULL, NULL, NULL },
> +{ TARGET_NR_fchdir, "fchdir" , "%s(%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_fchmod
> { TARGET_NR_fchmod, "fchmod" , "%s(%d,%#o)", NULL, NULL },
> @@ -287,7 +287,7 @@
> { TARGET_NR_getdtablesize, "getdtablesize" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_getegid
> -{ TARGET_NR_getegid, "getegid" , NULL, NULL, NULL },
> +{ TARGET_NR_getegid, "getegid" , "%s()", NULL, NULL },
> #endif
> #ifdef TARGET_NR_getegid32
> { TARGET_NR_getegid32, "getegid32" , NULL, NULL, NULL },
> @@ -299,7 +299,7 @@
> { TARGET_NR_geteuid32, "geteuid32" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_getgid
> -{ TARGET_NR_getgid, "getgid" , NULL, NULL, NULL },
> +{ TARGET_NR_getgid, "getgid" , "%s()", NULL, NULL },
> #endif
> #ifdef TARGET_NR_getgid32
> { TARGET_NR_getgid32, "getgid32" , NULL, NULL, NULL },
> @@ -329,10 +329,10 @@
> { TARGET_NR_getpeername, "getpeername" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_getpgid
> -{ TARGET_NR_getpgid, "getpgid" , NULL, NULL, NULL },
> +{ TARGET_NR_getpgid, "getpgid" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_getpgrp
> -{ TARGET_NR_getpgrp, "getpgrp" , NULL, NULL, NULL },
> +{ TARGET_NR_getpgrp, "getpgrp" , "%s()", NULL, NULL },
> #endif
> #ifdef TARGET_NR_getpid
> { TARGET_NR_getpid, "getpid" , "%s()", NULL, NULL },
> @@ -432,7 +432,7 @@
> { TARGET_NR_io_cancel, "io_cancel" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_ioctl
> -{ TARGET_NR_ioctl, "ioctl" , NULL, NULL, NULL },
> +{ TARGET_NR_ioctl, "ioctl" , "%s(%d,%#x,%#x)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_io_destroy
> { TARGET_NR_io_destroy, "io_destroy" , NULL, NULL, NULL },
> @@ -1257,22 +1257,22 @@
> { TARGET_NR_setdomainname, "setdomainname" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setfsgid
> -{ TARGET_NR_setfsgid, "setfsgid" , NULL, NULL, NULL },
> +{ TARGET_NR_setfsgid, "setfsgid" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setfsgid32
> -{ TARGET_NR_setfsgid32, "setfsgid32" , NULL, NULL, NULL },
> +{ TARGET_NR_setfsgid32, "setfsgid32" , "%s(%u)" , NULL, NULL },
> #endif
> #ifdef TARGET_NR_setfsuid
> -{ TARGET_NR_setfsuid, "setfsuid" , NULL, NULL, NULL },
> +{ TARGET_NR_setfsuid, "setfsuid" , "%s(%u)" , NULL, NULL },
> #endif
> #ifdef TARGET_NR_setfsuid32
> { TARGET_NR_setfsuid32, "setfsuid32" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setgid
> -{ TARGET_NR_setgid, "setgid" , NULL, NULL, NULL },
> +{ TARGET_NR_setgid, "setgid" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setgid32
> -{ TARGET_NR_setgid32, "setgid32" , NULL, NULL, NULL },
> +{ TARGET_NR_setgid32, "setgid32" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setgroups
> { TARGET_NR_setgroups, "setgroups" , NULL, NULL, NULL },
> @@ -1296,7 +1296,7 @@
> { TARGET_NR_setns, "setns" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setpgid
> -{ TARGET_NR_setpgid, "setpgid" , NULL, NULL, NULL },
> +{ TARGET_NR_setpgid, "setpgid" , "%s(%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setpgrp
> { TARGET_NR_setpgrp, "setpgrp" , NULL, NULL, NULL },
> @@ -1311,22 +1311,22 @@
> { TARGET_NR_setregid32, "setregid32" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setresgid
> -{ TARGET_NR_setresgid, "setresgid" , NULL, NULL, NULL },
> +{ TARGET_NR_setresgid, "setresgid" , "%s(%u,%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setresgid32
> { TARGET_NR_setresgid32, "setresgid32" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setresuid
> -{ TARGET_NR_setresuid, "setresuid" , NULL, NULL, NULL },
> +{ TARGET_NR_setresuid, "setresuid" , "%s(%u,%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setresuid32
> -{ TARGET_NR_setresuid32, "setresuid32" , NULL, NULL, NULL },
> +{ TARGET_NR_setresuid32, "setresuid32" , "%s(%u,%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setreuid
> -{ TARGET_NR_setreuid, "setreuid" , NULL, NULL, NULL },
> +{ TARGET_NR_setreuid, "setreuid" , "%s(%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setreuid32
> -{ TARGET_NR_setreuid32, "setreuid32" , NULL, NULL, NULL },
> +{ TARGET_NR_setreuid32, "setreuid32" , "%s(%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setrlimit
> { TARGET_NR_setrlimit, "setrlimit" , NULL, NULL, NULL },
> @@ -1335,7 +1335,7 @@
> { TARGET_NR_set_robust_list, "set_robust_list" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setsid
> -{ TARGET_NR_setsid, "setsid" , NULL, NULL, NULL },
> +{ TARGET_NR_setsid, "setsid" , "%s()", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setsockopt
> { TARGET_NR_setsockopt, "setsockopt" , NULL, NULL, NULL },
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] linux-user/strace: Improve output of various syscalls
2019-11-21 19:33 [PATCH v3] linux-user/strace: Improve output of various syscalls Helge Deller
2019-11-21 19:40 ` Aleksandar Markovic
@ 2019-11-22 10:54 ` Philippe Mathieu-Daudé
2020-02-18 19:57 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-11-22 10:54 UTC (permalink / raw)
To: Helge Deller, qemu-devel, Aleksandar Markovic
Cc: Richard Henderson, Philippe Mathieu-Daudé, Laurent Vivier
On 11/21/19 8:33 PM, Helge Deller wrote:
> Improve strace output of various syscalls which either have none
> or only int-type parameters.
>
> Signed-off-by: Helge Deller <deller@gmx.de>
>
> ---
> Changes in v3:
> fixed alarm()
> added epoll_create(), epoll_create1(), eventfd(), eventfd2()
>
> Changes in v2:
> fixed ioctl()
>
>
> diff --git a/linux-user/strace.list b/linux-user/strace.list
> index 1de4319dcf..d49a1e92a8 100644
> --- a/linux-user/strace.list
> +++ b/linux-user/strace.list
> @@ -26,7 +26,7 @@
> { TARGET_NR_afs_syscall, "afs_syscall" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_alarm
> -{ TARGET_NR_alarm, "alarm" , NULL, NULL, NULL },
> +{ TARGET_NR_alarm, "alarm" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_aplib
> { TARGET_NR_aplib, "aplib" , NULL, NULL, NULL },
> @@ -116,19 +116,19 @@
> { TARGET_NR_dipc, "dipc" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_dup
> -{ TARGET_NR_dup, "dup" , NULL, NULL, NULL },
> +{ TARGET_NR_dup, "dup" , "%s(%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_dup2
> -{ TARGET_NR_dup2, "dup2" , NULL, NULL, NULL },
> +{ TARGET_NR_dup2, "dup2" , "%s(%d,%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_dup3
> -{ TARGET_NR_dup3, "dup3" , NULL, NULL, NULL },
> +{ TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_epoll_create
> -{ TARGET_NR_epoll_create, "epoll_create" , NULL, NULL, NULL },
> +{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_epoll_create1
> -{ TARGET_NR_epoll_create1, "epoll_create1" , NULL, NULL, NULL },
> +{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_epoll_ctl
> { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL },
> @@ -146,10 +146,10 @@
> { TARGET_NR_epoll_wait_old, "epoll_wait_old" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_eventfd
> -{ TARGET_NR_eventfd, "eventfd" , NULL, NULL, NULL },
> +{ TARGET_NR_eventfd, "eventfd", "%s(%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_eventfd2
> -{ TARGET_NR_eventfd2, "eventfd2" , NULL, NULL, NULL },
> +{ TARGET_NR_eventfd2, "eventfd2" , "%s(%d,%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_execv
> { TARGET_NR_execv, "execv" , NULL, print_execv, NULL },
> @@ -191,7 +191,7 @@
> { TARGET_NR_fanotify_mark, "fanotify_mark" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_fchdir
> -{ TARGET_NR_fchdir, "fchdir" , NULL, NULL, NULL },
> +{ TARGET_NR_fchdir, "fchdir" , "%s(%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_fchmod
> { TARGET_NR_fchmod, "fchmod" , "%s(%d,%#o)", NULL, NULL },
> @@ -287,7 +287,7 @@
> { TARGET_NR_getdtablesize, "getdtablesize" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_getegid
> -{ TARGET_NR_getegid, "getegid" , NULL, NULL, NULL },
> +{ TARGET_NR_getegid, "getegid" , "%s()", NULL, NULL },
Oh I didn't realize using this format improves the output by not
displaying the value of unused registers.
Few other syscalls can be improved this way too.
Good cleanup.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> #endif
> #ifdef TARGET_NR_getegid32
> { TARGET_NR_getegid32, "getegid32" , NULL, NULL, NULL },
> @@ -299,7 +299,7 @@
> { TARGET_NR_geteuid32, "geteuid32" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_getgid
> -{ TARGET_NR_getgid, "getgid" , NULL, NULL, NULL },
> +{ TARGET_NR_getgid, "getgid" , "%s()", NULL, NULL },
> #endif
> #ifdef TARGET_NR_getgid32
> { TARGET_NR_getgid32, "getgid32" , NULL, NULL, NULL },
> @@ -329,10 +329,10 @@
> { TARGET_NR_getpeername, "getpeername" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_getpgid
> -{ TARGET_NR_getpgid, "getpgid" , NULL, NULL, NULL },
> +{ TARGET_NR_getpgid, "getpgid" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_getpgrp
> -{ TARGET_NR_getpgrp, "getpgrp" , NULL, NULL, NULL },
> +{ TARGET_NR_getpgrp, "getpgrp" , "%s()", NULL, NULL },
> #endif
> #ifdef TARGET_NR_getpid
> { TARGET_NR_getpid, "getpid" , "%s()", NULL, NULL },
> @@ -432,7 +432,7 @@
> { TARGET_NR_io_cancel, "io_cancel" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_ioctl
> -{ TARGET_NR_ioctl, "ioctl" , NULL, NULL, NULL },
> +{ TARGET_NR_ioctl, "ioctl" , "%s(%d,%#x,%#x)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_io_destroy
> { TARGET_NR_io_destroy, "io_destroy" , NULL, NULL, NULL },
> @@ -1257,22 +1257,22 @@
> { TARGET_NR_setdomainname, "setdomainname" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setfsgid
> -{ TARGET_NR_setfsgid, "setfsgid" , NULL, NULL, NULL },
> +{ TARGET_NR_setfsgid, "setfsgid" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setfsgid32
> -{ TARGET_NR_setfsgid32, "setfsgid32" , NULL, NULL, NULL },
> +{ TARGET_NR_setfsgid32, "setfsgid32" , "%s(%u)" , NULL, NULL },
> #endif
> #ifdef TARGET_NR_setfsuid
> -{ TARGET_NR_setfsuid, "setfsuid" , NULL, NULL, NULL },
> +{ TARGET_NR_setfsuid, "setfsuid" , "%s(%u)" , NULL, NULL },
> #endif
> #ifdef TARGET_NR_setfsuid32
> { TARGET_NR_setfsuid32, "setfsuid32" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setgid
> -{ TARGET_NR_setgid, "setgid" , NULL, NULL, NULL },
> +{ TARGET_NR_setgid, "setgid" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setgid32
> -{ TARGET_NR_setgid32, "setgid32" , NULL, NULL, NULL },
> +{ TARGET_NR_setgid32, "setgid32" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setgroups
> { TARGET_NR_setgroups, "setgroups" , NULL, NULL, NULL },
> @@ -1296,7 +1296,7 @@
> { TARGET_NR_setns, "setns" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setpgid
> -{ TARGET_NR_setpgid, "setpgid" , NULL, NULL, NULL },
> +{ TARGET_NR_setpgid, "setpgid" , "%s(%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setpgrp
> { TARGET_NR_setpgrp, "setpgrp" , NULL, NULL, NULL },
> @@ -1311,22 +1311,22 @@
> { TARGET_NR_setregid32, "setregid32" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setresgid
> -{ TARGET_NR_setresgid, "setresgid" , NULL, NULL, NULL },
> +{ TARGET_NR_setresgid, "setresgid" , "%s(%u,%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setresgid32
> { TARGET_NR_setresgid32, "setresgid32" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setresuid
> -{ TARGET_NR_setresuid, "setresuid" , NULL, NULL, NULL },
> +{ TARGET_NR_setresuid, "setresuid" , "%s(%u,%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setresuid32
> -{ TARGET_NR_setresuid32, "setresuid32" , NULL, NULL, NULL },
> +{ TARGET_NR_setresuid32, "setresuid32" , "%s(%u,%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setreuid
> -{ TARGET_NR_setreuid, "setreuid" , NULL, NULL, NULL },
> +{ TARGET_NR_setreuid, "setreuid" , "%s(%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setreuid32
> -{ TARGET_NR_setreuid32, "setreuid32" , NULL, NULL, NULL },
> +{ TARGET_NR_setreuid32, "setreuid32" , "%s(%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setrlimit
> { TARGET_NR_setrlimit, "setrlimit" , NULL, NULL, NULL },
> @@ -1335,7 +1335,7 @@
> { TARGET_NR_set_robust_list, "set_robust_list" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setsid
> -{ TARGET_NR_setsid, "setsid" , NULL, NULL, NULL },
> +{ TARGET_NR_setsid, "setsid" , "%s()", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setsockopt
> { TARGET_NR_setsockopt, "setsockopt" , NULL, NULL, NULL },
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] linux-user/strace: Improve output of various syscalls
2019-11-21 19:33 [PATCH v3] linux-user/strace: Improve output of various syscalls Helge Deller
2019-11-21 19:40 ` Aleksandar Markovic
2019-11-22 10:54 ` Philippe Mathieu-Daudé
@ 2020-02-18 19:57 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Laurent Vivier @ 2020-02-18 19:57 UTC (permalink / raw)
To: Helge Deller, qemu-devel, Aleksandar Markovic
Cc: Richard Henderson, Philippe Mathieu-Daudé
Le 21/11/2019 à 20:33, Helge Deller a écrit :
> Improve strace output of various syscalls which either have none
> or only int-type parameters.
>
> Signed-off-by: Helge Deller <deller@gmx.de>
>
> ---
> Changes in v3:
> fixed alarm()
> added epoll_create(), epoll_create1(), eventfd(), eventfd2()
>
> Changes in v2:
> fixed ioctl()
>
>
> diff --git a/linux-user/strace.list b/linux-user/strace.list
> index 1de4319dcf..d49a1e92a8 100644
> --- a/linux-user/strace.list
> +++ b/linux-user/strace.list
> @@ -26,7 +26,7 @@
> { TARGET_NR_afs_syscall, "afs_syscall" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_alarm
> -{ TARGET_NR_alarm, "alarm" , NULL, NULL, NULL },
> +{ TARGET_NR_alarm, "alarm" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_aplib
> { TARGET_NR_aplib, "aplib" , NULL, NULL, NULL },
> @@ -116,19 +116,19 @@
> { TARGET_NR_dipc, "dipc" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_dup
> -{ TARGET_NR_dup, "dup" , NULL, NULL, NULL },
> +{ TARGET_NR_dup, "dup" , "%s(%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_dup2
> -{ TARGET_NR_dup2, "dup2" , NULL, NULL, NULL },
> +{ TARGET_NR_dup2, "dup2" , "%s(%d,%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_dup3
> -{ TARGET_NR_dup3, "dup3" , NULL, NULL, NULL },
> +{ TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_epoll_create
> -{ TARGET_NR_epoll_create, "epoll_create" , NULL, NULL, NULL },
> +{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_epoll_create1
> -{ TARGET_NR_epoll_create1, "epoll_create1" , NULL, NULL, NULL },
> +{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_epoll_ctl
> { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL },
> @@ -146,10 +146,10 @@
> { TARGET_NR_epoll_wait_old, "epoll_wait_old" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_eventfd
> -{ TARGET_NR_eventfd, "eventfd" , NULL, NULL, NULL },
> +{ TARGET_NR_eventfd, "eventfd", "%s(%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_eventfd2
> -{ TARGET_NR_eventfd2, "eventfd2" , NULL, NULL, NULL },
> +{ TARGET_NR_eventfd2, "eventfd2" , "%s(%d,%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_execv
> { TARGET_NR_execv, "execv" , NULL, print_execv, NULL },
> @@ -191,7 +191,7 @@
> { TARGET_NR_fanotify_mark, "fanotify_mark" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_fchdir
> -{ TARGET_NR_fchdir, "fchdir" , NULL, NULL, NULL },
> +{ TARGET_NR_fchdir, "fchdir" , "%s(%d)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_fchmod
> { TARGET_NR_fchmod, "fchmod" , "%s(%d,%#o)", NULL, NULL },
> @@ -287,7 +287,7 @@
> { TARGET_NR_getdtablesize, "getdtablesize" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_getegid
> -{ TARGET_NR_getegid, "getegid" , NULL, NULL, NULL },
> +{ TARGET_NR_getegid, "getegid" , "%s()", NULL, NULL },
> #endif
> #ifdef TARGET_NR_getegid32
> { TARGET_NR_getegid32, "getegid32" , NULL, NULL, NULL },
> @@ -299,7 +299,7 @@
> { TARGET_NR_geteuid32, "geteuid32" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_getgid
> -{ TARGET_NR_getgid, "getgid" , NULL, NULL, NULL },
> +{ TARGET_NR_getgid, "getgid" , "%s()", NULL, NULL },
> #endif
> #ifdef TARGET_NR_getgid32
> { TARGET_NR_getgid32, "getgid32" , NULL, NULL, NULL },
> @@ -329,10 +329,10 @@
> { TARGET_NR_getpeername, "getpeername" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_getpgid
> -{ TARGET_NR_getpgid, "getpgid" , NULL, NULL, NULL },
> +{ TARGET_NR_getpgid, "getpgid" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_getpgrp
> -{ TARGET_NR_getpgrp, "getpgrp" , NULL, NULL, NULL },
> +{ TARGET_NR_getpgrp, "getpgrp" , "%s()", NULL, NULL },
> #endif
> #ifdef TARGET_NR_getpid
> { TARGET_NR_getpid, "getpid" , "%s()", NULL, NULL },
> @@ -432,7 +432,7 @@
> { TARGET_NR_io_cancel, "io_cancel" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_ioctl
> -{ TARGET_NR_ioctl, "ioctl" , NULL, NULL, NULL },
> +{ TARGET_NR_ioctl, "ioctl" , "%s(%d,%#x,%#x)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_io_destroy
> { TARGET_NR_io_destroy, "io_destroy" , NULL, NULL, NULL },
> @@ -1257,22 +1257,22 @@
> { TARGET_NR_setdomainname, "setdomainname" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setfsgid
> -{ TARGET_NR_setfsgid, "setfsgid" , NULL, NULL, NULL },
> +{ TARGET_NR_setfsgid, "setfsgid" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setfsgid32
> -{ TARGET_NR_setfsgid32, "setfsgid32" , NULL, NULL, NULL },
> +{ TARGET_NR_setfsgid32, "setfsgid32" , "%s(%u)" , NULL, NULL },
> #endif
> #ifdef TARGET_NR_setfsuid
> -{ TARGET_NR_setfsuid, "setfsuid" , NULL, NULL, NULL },
> +{ TARGET_NR_setfsuid, "setfsuid" , "%s(%u)" , NULL, NULL },
> #endif
> #ifdef TARGET_NR_setfsuid32
> { TARGET_NR_setfsuid32, "setfsuid32" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setgid
> -{ TARGET_NR_setgid, "setgid" , NULL, NULL, NULL },
> +{ TARGET_NR_setgid, "setgid" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setgid32
> -{ TARGET_NR_setgid32, "setgid32" , NULL, NULL, NULL },
> +{ TARGET_NR_setgid32, "setgid32" , "%s(%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setgroups
> { TARGET_NR_setgroups, "setgroups" , NULL, NULL, NULL },
> @@ -1296,7 +1296,7 @@
> { TARGET_NR_setns, "setns" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setpgid
> -{ TARGET_NR_setpgid, "setpgid" , NULL, NULL, NULL },
> +{ TARGET_NR_setpgid, "setpgid" , "%s(%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setpgrp
> { TARGET_NR_setpgrp, "setpgrp" , NULL, NULL, NULL },
> @@ -1311,22 +1311,22 @@
> { TARGET_NR_setregid32, "setregid32" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setresgid
> -{ TARGET_NR_setresgid, "setresgid" , NULL, NULL, NULL },
> +{ TARGET_NR_setresgid, "setresgid" , "%s(%u,%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setresgid32
> { TARGET_NR_setresgid32, "setresgid32" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setresuid
> -{ TARGET_NR_setresuid, "setresuid" , NULL, NULL, NULL },
> +{ TARGET_NR_setresuid, "setresuid" , "%s(%u,%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setresuid32
> -{ TARGET_NR_setresuid32, "setresuid32" , NULL, NULL, NULL },
> +{ TARGET_NR_setresuid32, "setresuid32" , "%s(%u,%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setreuid
> -{ TARGET_NR_setreuid, "setreuid" , NULL, NULL, NULL },
> +{ TARGET_NR_setreuid, "setreuid" , "%s(%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setreuid32
> -{ TARGET_NR_setreuid32, "setreuid32" , NULL, NULL, NULL },
> +{ TARGET_NR_setreuid32, "setreuid32" , "%s(%u,%u)", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setrlimit
> { TARGET_NR_setrlimit, "setrlimit" , NULL, NULL, NULL },
> @@ -1335,7 +1335,7 @@
> { TARGET_NR_set_robust_list, "set_robust_list" , NULL, NULL, NULL },
> #endif
> #ifdef TARGET_NR_setsid
> -{ TARGET_NR_setsid, "setsid" , NULL, NULL, NULL },
> +{ TARGET_NR_setsid, "setsid" , "%s()", NULL, NULL },
> #endif
> #ifdef TARGET_NR_setsockopt
> { TARGET_NR_setsockopt, "setsockopt" , NULL, NULL, NULL },
>
Applied to my linux-user branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-18 19:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-21 19:33 [PATCH v3] linux-user/strace: Improve output of various syscalls Helge Deller
2019-11-21 19:40 ` Aleksandar Markovic
2019-11-22 10:54 ` Philippe Mathieu-Daudé
2020-02-18 19:57 ` Laurent Vivier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).