| Message ID | 20190320123625.9207-1-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3] linux-user: rename gettid() to sys_gettid() to avoid clash with glibc | expand |
Le 20/03/2019 à 13:36, Daniel P. Berrangé a écrit : > The glibc-2.29.9000-6.fc31.x86_64 package finally includes the gettid() > function as part of unistd.h when __USE_GNU is defined. This clashes > with linux-user code which unconditionally defines this function name > itself. > > /home/berrange/src/virt/qemu/linux-user/syscall.c:253:16: error: static declaration of ‘gettid’ follows non-static declaration > 253 | _syscall0(int, gettid) > | ^~~~~~ > /home/berrange/src/virt/qemu/linux-user/syscall.c:184:13: note: in definition of macro ‘_syscall0’ > 184 | static type name (void) \ > | ^~~~ > In file included from /usr/include/unistd.h:1170, > from /home/berrange/src/virt/qemu/include/qemu/osdep.h:107, > from /home/berrange/src/virt/qemu/linux-user/syscall.c:20: > /usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here > 34 | extern __pid_t gettid (void) __THROW; > | ^~~~~~ > CC aarch64-linux-user/linux-user/signal.o > make[1]: *** [/home/berrange/src/virt/qemu/rules.mak:69: linux-user/syscall.o] Error 1 > make[1]: *** Waiting for unfinished jobs.... > make: *** [Makefile:449: subdir-aarch64-linux-user] Error 2 > > While we could make our definition conditional and rely on glibc's impl, > this patch simply renames our definition to sys_gettid() which is a > common pattern in this file. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > > Changed in v3: > - put { on separate line to please checkpatch > > Changed in v2: > - Rename to sys_gettid instead of using conditional compilation > > linux-user/syscall.c | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 208fd1813d..804695411f 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -250,11 +250,15 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \ > #endif > > #ifdef __NR_gettid > -_syscall0(int, gettid) > +static int sys_gettid(void) > +{ > + return syscall(__NR_gettid); > +} For other sys_ syscall we have something like #define __NR_sys_gettid __NR_gettid #ifdef __NR_gettid syscall0(int, sys_gettid) ... > #else > /* This is a replacement for the host gettid() and must return a host > errno. */ > -static int gettid(void) { > +static int sys_gettid(void) > +{ > return -ENOSYS; > } Perhaps we can avoid the "#else" as it will put a -ENOSYS in the ->tid of the structures. According to manpage, gettid appeared with linux 2.4.11 I don't think we support a kernel as old as this. Thanks, Laurent
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 208fd1813d..804695411f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -250,11 +250,15 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \ #endif #ifdef __NR_gettid -_syscall0(int, gettid) +static int sys_gettid(void) +{ + return syscall(__NR_gettid); +} #else /* This is a replacement for the host gettid() and must return a host errno. */ -static int gettid(void) { +static int sys_gettid(void) +{ return -ENOSYS; } #endif @@ -5442,7 +5446,7 @@ static void *clone_func(void *arg) cpu = ENV_GET_CPU(env); thread_cpu = cpu; ts = (TaskState *)cpu->opaque; - info->tid = gettid(); + info->tid = sys_gettid(); task_settid(ts); if (info->child_tidptr) put_user_u32(info->tid, info->child_tidptr); @@ -5587,9 +5591,9 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp, mapping. We can't repeat the spinlock hack used above because the child process gets its own copy of the lock. */ if (flags & CLONE_CHILD_SETTID) - put_user_u32(gettid(), child_tidptr); + put_user_u32(sys_gettid(), child_tidptr); if (flags & CLONE_PARENT_SETTID) - put_user_u32(gettid(), parent_tidptr); + put_user_u32(sys_gettid(), parent_tidptr); ts = (TaskState *)cpu->opaque; if (flags & CLONE_SETTLS) cpu_set_tls (env, newtls); @@ -10629,7 +10633,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, return TARGET_PAGE_SIZE; #endif case TARGET_NR_gettid: - return get_errno(gettid()); + return get_errno(sys_gettid()); #ifdef TARGET_NR_readahead case TARGET_NR_readahead: #if TARGET_ABI_BITS == 32
The glibc-2.29.9000-6.fc31.x86_64 package finally includes the gettid() function as part of unistd.h when __USE_GNU is defined. This clashes with linux-user code which unconditionally defines this function name itself. /home/berrange/src/virt/qemu/linux-user/syscall.c:253:16: error: static declaration of ‘gettid’ follows non-static declaration 253 | _syscall0(int, gettid) | ^~~~~~ /home/berrange/src/virt/qemu/linux-user/syscall.c:184:13: note: in definition of macro ‘_syscall0’ 184 | static type name (void) \ | ^~~~ In file included from /usr/include/unistd.h:1170, from /home/berrange/src/virt/qemu/include/qemu/osdep.h:107, from /home/berrange/src/virt/qemu/linux-user/syscall.c:20: /usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here 34 | extern __pid_t gettid (void) __THROW; | ^~~~~~ CC aarch64-linux-user/linux-user/signal.o make[1]: *** [/home/berrange/src/virt/qemu/rules.mak:69: linux-user/syscall.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:449: subdir-aarch64-linux-user] Error 2 While we could make our definition conditional and rely on glibc's impl, this patch simply renames our definition to sys_gettid() which is a common pattern in this file. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- Changed in v3: - put { on separate line to please checkpatch Changed in v2: - Rename to sys_gettid instead of using conditional compilation linux-user/syscall.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)