Fix compat with latest glibc which has gettid func
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé
parent
de10d8e08e
commit
e24cbbb32e
40
0002-linux-user-assume-__NR_gettid-always-exists.patch
Normal file
40
0002-linux-user-assume-__NR_gettid-always-exists.patch
Normal file
@ -0,0 +1,40 @@
|
||||
From 9abb23f799804ed7b30aecac2217f870b229f873 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
||||
Date: Wed, 20 Mar 2019 15:32:30 +0000
|
||||
Subject: [PATCH 1/2] linux-user: assume __NR_gettid always exists
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The gettid syscall was introduced in Linux 2.4.11. This is old enough
|
||||
that we can assume it always exists and thus not bother with the
|
||||
conditional backcompat logic.
|
||||
|
||||
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
---
|
||||
linux-user/syscall.c | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 208fd1813d..11729f382c 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -249,15 +249,7 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \
|
||||
#define TARGET_NR__llseek TARGET_NR_llseek
|
||||
#endif
|
||||
|
||||
-#ifdef __NR_gettid
|
||||
_syscall0(int, gettid)
|
||||
-#else
|
||||
-/* This is a replacement for the host gettid() and must return a host
|
||||
- errno. */
|
||||
-static int gettid(void) {
|
||||
- return -ENOSYS;
|
||||
-}
|
||||
-#endif
|
||||
|
||||
/* For the 64-bit guest on 32-bit host case we must emulate
|
||||
* getdents using getdents64, because otherwise the host
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -0,0 +1,87 @@
|
||||
From 7bfee99b5dc6dd971d4e0dec49af7578ea1b405c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
||||
Date: Tue, 19 Mar 2019 17:04:05 +0000
|
||||
Subject: [PATCH 2/2] linux-user: rename gettid() to sys_gettid() to avoid
|
||||
clash with glibc
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
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>
|
||||
---
|
||||
linux-user/syscall.c | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 11729f382c..96cd4bf86d 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -249,7 +249,8 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \
|
||||
#define TARGET_NR__llseek TARGET_NR_llseek
|
||||
#endif
|
||||
|
||||
-_syscall0(int, gettid)
|
||||
+#define __NR_sys_gettid __NR_gettid
|
||||
+_syscall0(int, sys_gettid)
|
||||
|
||||
/* For the 64-bit guest on 32-bit host case we must emulate
|
||||
* getdents using getdents64, because otherwise the host
|
||||
@@ -5434,7 +5435,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);
|
||||
@@ -5579,9 +5580,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);
|
||||
@@ -10621,7 +10622,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
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -127,7 +127,7 @@ Requires: %{name}-ui-sdl = %{epoch}:%{version}-%{release}
|
||||
Summary: QEMU is a FAST! processor emulator
|
||||
Name: qemu
|
||||
Version: 3.1.0
|
||||
Release: 4%{?rcrel}%{?dist}.3
|
||||
Release: 5%{?rcrel}%{?dist}
|
||||
Epoch: 2
|
||||
License: GPLv2 and BSD and MIT and CC-BY
|
||||
URL: http://www.qemu.org/
|
||||
@ -154,6 +154,10 @@ Source21: 95-kvm-ppc64-memlock.conf
|
||||
# Good ol' keymap 86 still messin with us
|
||||
Patch0: 0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch
|
||||
|
||||
# Modern glibc has a gettid function
|
||||
Patch1: 0002-linux-user-assume-__NR_gettid-always-exists.patch
|
||||
Patch2: 0003-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch
|
||||
|
||||
|
||||
|
||||
# documentation deps
|
||||
@ -1636,6 +1640,9 @@ getent passwd qemu >/dev/null || \
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Mar 20 2019 Daniel P. Berrangé <berrange@redhat.com> - 2:3.1.0-5
|
||||
- Fix compat with latest glibc which has gettid func
|
||||
|
||||
* Sun Mar 03 2019 Cole Robinson <aintdiscole@gmail.com> - 2:3.1.0-4.3
|
||||
- Temporarily disable glusterfs (bz #1684298)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user