summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-12-22 04:05:48 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-16 12:35:10 (GMT)
commite52122a3e6912575ff401a4af6ac1bf3070092bc (patch)
tree5093f58c8aa0c0bafc6d8400ecc8273b39792608
parente7e1b9a43dee9eb289e936513b2ee68963ae1628 (diff)
downloadpoky-thud.tar.gz
qemu: Replace stime() API with clock_settimethud
(From OE-Core rev: 2cca75155baec8358939e2aae822e256bed4cfe0) (From OE-Core rev: 1351f9be973cfbd043f9b10d218e3cecaa0ab372) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch62
-rw-r--r--meta/recipes-devtools/qemu/qemu_3.0.0.bb1
2 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
new file mode 100644
index 0000000..618ebcd
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch
@@ -0,0 +1,62 @@
1From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001
2From: Laurent Vivier <laurent@vivier.eu>
3Date: Tue, 12 Nov 2019 15:25:56 +0100
4Subject: [PATCH] linux-user: remove host stime() syscall
5
6stime() has been withdrawn from glibc
7(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.")
8
9Implement the target stime() syscall using host
10clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc.
11
12Tested qemu-ppc/x86_64 with:
13
14 #include <time.h>
15 #include <stdio.h>
16
17 int main(void)
18 {
19 time_t t;
20 int ret;
21
22 /* date -u -d"2019-11-12T15:11:00" "+%s" */
23 t = 1573571460;
24 ret = stime(&t);
25 printf("ret %d\n", ret);
26 return 0;
27 }
28
29 # date; ./stime; date
30 Tue Nov 12 14:18:32 UTC 2019
31 ret 0
32 Tue Nov 12 15:11:00 UTC 2019
33
34Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f]
35Buglink: https://bugs.launchpad.net/qemu/+bug/1852115
36Reported-by: Cole Robinson <crobinso@redhat.com>
37Signed-off-by: Laurent Vivier <laurent@vivier.eu>
38Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
39Message-Id: <20191112142556.6335-1-laurent@vivier.eu>
40---
41 linux-user/syscall.c | 8 +++++---
42 1 file changed, 5 insertions(+), 3 deletions(-)
43
44Index: qemu-3.0.0/linux-user/syscall.c
45===================================================================
46--- qemu-3.0.0.orig/linux-user/syscall.c
47+++ qemu-3.0.0/linux-user/syscall.c
48@@ -8520,10 +8520,11 @@ abi_long do_syscall(void *cpu_env, int n
49 #ifdef TARGET_NR_stime /* not on alpha */
50 case TARGET_NR_stime:
51 {
52- time_t host_time;
53- if (get_user_sal(host_time, arg1))
54+ struct timespec ts;
55+ ts.tv_nsec = 0;
56+ if (get_user_sal(ts.tv_sec, arg1))
57 goto efault;
58- ret = get_errno(stime(&host_time));
59+ ret = get_errno(clock_settime(CLOCK_REALTIME, &ts));
60 }
61 break;
62 #endif
diff --git a/meta/recipes-devtools/qemu/qemu_3.0.0.bb b/meta/recipes-devtools/qemu/qemu_3.0.0.bb
index e483aca..1daee72 100644
--- a/meta/recipes-devtools/qemu/qemu_3.0.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_3.0.0.bb
@@ -42,6 +42,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
42 file://CVE-2019-8934.patch \ 42 file://CVE-2019-8934.patch \
43 file://0001-linux-user-assume-__NR_gettid-always-exists.patch \ 43 file://0001-linux-user-assume-__NR_gettid-always-exists.patch \
44 file://0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch \ 44 file://0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch \
45 file://0011-linux-user-remove-host-stime-syscall.patch \
45 " 46 "
46UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" 47UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
47 48