linux-user/strace.c | 3 ++- linux-user/strace.list | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)
Some target are using llseek instead of _llseek like riscv,
nios2, hexagon, and openrisc.
Signed-off-by: Kito Cheng <kito.cheng@sifive.com>
---
linux-user/strace.c | 3 ++-
linux-user/strace.list | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/linux-user/strace.c b/linux-user/strace.c
index e969121b6c..4ebf85b063 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -2335,7 +2335,7 @@ print_linkat(void *cpu_env, const struct syscallname *name,
}
#endif
-#ifdef TARGET_NR__llseek
+#if defined(TARGET_NR__llseek) || defined(TARGET_NR_llseek)
static void
print__llseek(void *cpu_env, const struct syscallname *name,
abi_long arg0, abi_long arg1, abi_long arg2,
@@ -2355,6 +2355,7 @@ print__llseek(void *cpu_env, const struct syscallname *name,
qemu_log("%s", whence);
print_syscall_epilogue(name);
}
+#define print_llseek print__llseek
#endif
#ifdef TARGET_NR_lseek
diff --git a/linux-user/strace.list b/linux-user/strace.list
index 084048ab96..46e1410836 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -511,6 +511,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.31.1
Le 12/05/2021 à 12:13, Kito Cheng a écrit : > Some target are using llseek instead of _llseek like riscv, > nios2, hexagon, and openrisc. > > Signed-off-by: Kito Cheng <kito.cheng@sifive.com> > --- > linux-user/strace.c | 3 ++- > linux-user/strace.list | 3 +++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/linux-user/strace.c b/linux-user/strace.c > index e969121b6c..4ebf85b063 100644 > --- a/linux-user/strace.c > +++ b/linux-user/strace.c > @@ -2335,7 +2335,7 @@ print_linkat(void *cpu_env, const struct syscallname *name, > } > #endif > > -#ifdef TARGET_NR__llseek > +#if defined(TARGET_NR__llseek) || defined(TARGET_NR_llseek) > static void > print__llseek(void *cpu_env, const struct syscallname *name, > abi_long arg0, abi_long arg1, abi_long arg2, > @@ -2355,6 +2355,7 @@ print__llseek(void *cpu_env, const struct syscallname *name, > qemu_log("%s", whence); > print_syscall_epilogue(name); > } > +#define print_llseek print__llseek > #endif > > #ifdef TARGET_NR_lseek > diff --git a/linux-user/strace.list b/linux-user/strace.list > index 084048ab96..46e1410836 100644 > --- a/linux-user/strace.list > +++ b/linux-user/strace.list > @@ -511,6 +511,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: Laurent Vivier <laurent@vivier.eu>
Le 12/05/2021 à 12:13, Kito Cheng a écrit : > Some target are using llseek instead of _llseek like riscv, > nios2, hexagon, and openrisc. > > Signed-off-by: Kito Cheng <kito.cheng@sifive.com> > --- > linux-user/strace.c | 3 ++- > linux-user/strace.list | 3 +++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/linux-user/strace.c b/linux-user/strace.c > index e969121b6c..4ebf85b063 100644 > --- a/linux-user/strace.c > +++ b/linux-user/strace.c > @@ -2335,7 +2335,7 @@ print_linkat(void *cpu_env, const struct syscallname *name, > } > #endif > > -#ifdef TARGET_NR__llseek > +#if defined(TARGET_NR__llseek) || defined(TARGET_NR_llseek) > static void > print__llseek(void *cpu_env, const struct syscallname *name, > abi_long arg0, abi_long arg1, abi_long arg2, > @@ -2355,6 +2355,7 @@ print__llseek(void *cpu_env, const struct syscallname *name, > qemu_log("%s", whence); > print_syscall_epilogue(name); > } > +#define print_llseek print__llseek > #endif > > #ifdef TARGET_NR_lseek > diff --git a/linux-user/strace.list b/linux-user/strace.list > index 084048ab96..46e1410836 100644 > --- a/linux-user/strace.list > +++ b/linux-user/strace.list > @@ -511,6 +511,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 > Applied to my linux-user-for-6.1 branch. Thanks, Laurent
© 2016 - 2024 Red Hat, Inc.