* [PATCH] Enable strace for TARGET_NR_llseek
@ 2020-03-16 20:52 Taylor Simpson
2020-03-17 9:19 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 2+ messages in thread
From: Taylor Simpson @ 2020-03-16 20:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Taylor Simpson, riku.voipio, laurent
linux-user/syscall.c handles the case where TARGET_NR_llseek (one underscore)
is defined and TARGET_NR__llseek (two underscores)
/* Newer kernel ports have llseek() instead of _llseek() */
#if defined(TARGET_NR_llseek) && !defined(TARGET_NR__llseek)
#define TARGET_NR__llseek TARGET_NR_llseek
#endif
Unfortunately, strace will print "Unknown syscall" in this case. This patch
fixes that problem.
Signed-off-by: Taylor Simpson <tsimpson@quicinc.com>
---
linux-user/strace.c | 2 +-
linux-user/strace.list | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 4f7130b..4bcc00b 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -1667,7 +1667,7 @@ print_linkat(const struct syscallname *name,
}
#endif
-#ifdef TARGET_NR__llseek
+#ifdef defined(TARGET_NR__llseek) || defined(TARGET_NR_llseek)
static void
print__llseek(const struct syscallname *name,
abi_long arg0, abi_long arg1, abi_long arg2,
diff --git a/linux-user/strace.list b/linux-user/strace.list
index d49a1e9..5a01e95 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -503,6 +503,9 @@
#ifdef TARGET_NR__llseek
{ TARGET_NR__llseek, "_llseek" , NULL, print__llseek, NULL },
#endif
+#ifdef TARGET_NR_llseek
+{ TARGET_NR_llseek, "_llseek" , NULL, print__llseek, NULL },
+#endif
#ifdef TARGET_NR_lock
{ TARGET_NR_lock, "lock" , NULL, NULL, NULL },
#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Enable strace for TARGET_NR_llseek
2020-03-16 20:52 [PATCH] Enable strace for TARGET_NR_llseek Taylor Simpson
@ 2020-03-17 9:19 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-03-17 9:19 UTC (permalink / raw)
To: Taylor Simpson, qemu-devel; +Cc: riku.voipio, laurent
On 3/16/20 9:52 PM, Taylor Simpson wrote:
> linux-user/syscall.c handles the case where TARGET_NR_llseek (one underscore)
> is defined and TARGET_NR__llseek (two underscores)
> /* Newer kernel ports have llseek() instead of _llseek() */
> #if defined(TARGET_NR_llseek) && !defined(TARGET_NR__llseek)
> #define TARGET_NR__llseek TARGET_NR_llseek
> #endif
>
> Unfortunately, strace will print "Unknown syscall" in this case. This patch
> fixes that problem.
>
> Signed-off-by: Taylor Simpson <tsimpson@quicinc.com>
> ---
> linux-user/strace.c | 2 +-
> linux-user/strace.list | 3 +++
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/linux-user/strace.c b/linux-user/strace.c
> index 4f7130b..4bcc00b 100644
> --- a/linux-user/strace.c
> +++ b/linux-user/strace.c
> @@ -1667,7 +1667,7 @@ print_linkat(const struct syscallname *name,
> }
> #endif
>
> -#ifdef TARGET_NR__llseek
> +#ifdef defined(TARGET_NR__llseek) || defined(TARGET_NR_llseek)
> static void
> print__llseek(const struct syscallname *name,
> abi_long arg0, abi_long arg1, abi_long arg2,
> diff --git a/linux-user/strace.list b/linux-user/strace.list
> index d49a1e9..5a01e95 100644
> --- a/linux-user/strace.list
> +++ b/linux-user/strace.list
> @@ -503,6 +503,9 @@
> #ifdef TARGET_NR__llseek
> { TARGET_NR__llseek, "_llseek" , NULL, print__llseek, NULL },
> #endif
> +#ifdef TARGET_NR_llseek
> +{ TARGET_NR_llseek, "_llseek" , NULL, print__llseek, NULL },
> +#endif
> #ifdef TARGET_NR_lock
> { TARGET_NR_lock, "lock" , NULL, NULL, NULL },
> #endif
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-17 9:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-16 20:52 [PATCH] Enable strace for TARGET_NR_llseek Taylor Simpson
2020-03-17 9:19 ` Philippe Mathieu-Daudé
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).