* [PATCH] linux-user: remove host stime() syscall
@ 2019-11-12 14:25 Laurent Vivier
2019-11-12 14:28 ` Peter Maydell
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Laurent Vivier @ 2019-11-12 14:25 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P . Berrange, Peter Maydell, Riku Voipio, Laurent Vivier,
Cole Robinson
stime() has been withdrawn from glibc
(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.")
Implement the target stime() syscall using host
clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc.
Tested qemu-ppc/x86_64 with:
#include <time.h>
#include <stdio.h>
int main(void)
{
time_t t;
int ret;
/* date -u -d"2019-11-12T15:11:00" "+%s" */
t = 1573571460;
ret = stime(&t);
printf("ret %d\n", ret);
return 0;
}
# date; ./stime; date
Tue Nov 12 14:18:32 UTC 2019
ret 0
Tue Nov 12 15:11:00 UTC 2019
Buglink: https://bugs.launchpad.net/qemu/+bug/1852115
Reported-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/syscall.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ab9d933e53af..c4dcdc94b10c 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7763,10 +7763,12 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
#ifdef TARGET_NR_stime /* not on alpha */
case TARGET_NR_stime:
{
- time_t host_time;
- if (get_user_sal(host_time, arg1))
+ struct timespec ts;
+ ts.tv_nsec = 0;
+ if (get_user_sal(ts.tv_sec, arg1)) {
return -TARGET_EFAULT;
- return get_errno(stime(&host_time));
+ }
+ return get_errno(clock_settime(CLOCK_REALTIME, &ts));
}
#endif
#ifdef TARGET_NR_alarm /* not on alpha */
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] linux-user: remove host stime() syscall
2019-11-12 14:25 [PATCH] linux-user: remove host stime() syscall Laurent Vivier
@ 2019-11-12 14:28 ` Peter Maydell
2019-11-12 14:45 ` Cole Robinson
2019-11-12 16:07 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2019-11-12 14:28 UTC (permalink / raw)
To: Laurent Vivier
Cc: Daniel P . Berrange, Riku Voipio, QEMU Developers, Cole Robinson
On Tue, 12 Nov 2019 at 14:26, Laurent Vivier <laurent@vivier.eu> wrote:
>
> stime() has been withdrawn from glibc
> (12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.")
>
> Implement the target stime() syscall using host
> clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc.
>
> Tested qemu-ppc/x86_64 with:
>
> #include <time.h>
> #include <stdio.h>
>
> int main(void)
> {
> time_t t;
> int ret;
>
> /* date -u -d"2019-11-12T15:11:00" "+%s" */
> t = 1573571460;
> ret = stime(&t);
> printf("ret %d\n", ret);
> return 0;
> }
>
> # date; ./stime; date
> Tue Nov 12 14:18:32 UTC 2019
> ret 0
> Tue Nov 12 15:11:00 UTC 2019
>
> Buglink: https://bugs.launchpad.net/qemu/+bug/1852115
> Reported-by: Cole Robinson <crobinso@redhat.com>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] linux-user: remove host stime() syscall
2019-11-12 14:25 [PATCH] linux-user: remove host stime() syscall Laurent Vivier
2019-11-12 14:28 ` Peter Maydell
@ 2019-11-12 14:45 ` Cole Robinson
2019-11-12 16:07 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Cole Robinson @ 2019-11-12 14:45 UTC (permalink / raw)
To: Laurent Vivier, qemu-devel
Cc: Daniel P . Berrange, Peter Maydell, Riku Voipio
On 11/12/19 9:25 AM, Laurent Vivier wrote:
> stime() has been withdrawn from glibc
> (12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.")
>
> Implement the target stime() syscall using host
> clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc.
>
> Tested qemu-ppc/x86_64 with:
>
> #include <time.h>
> #include <stdio.h>
>
> int main(void)
> {
> time_t t;
> int ret;
>
> /* date -u -d"2019-11-12T15:11:00" "+%s" */
> t = 1573571460;
> ret = stime(&t);
> printf("ret %d\n", ret);
> return 0;
> }
>
> # date; ./stime; date
> Tue Nov 12 14:18:32 UTC 2019
> ret 0
> Tue Nov 12 15:11:00 UTC 2019
>
> Buglink: https://bugs.launchpad.net/qemu/+bug/1852115
> Reported-by: Cole Robinson <crobinso@redhat.com>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Fixes the build issue for me. Thanks Laurent!
- Cole
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] linux-user: remove host stime() syscall
2019-11-12 14:25 [PATCH] linux-user: remove host stime() syscall Laurent Vivier
2019-11-12 14:28 ` Peter Maydell
2019-11-12 14:45 ` Cole Robinson
@ 2019-11-12 16:07 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Laurent Vivier @ 2019-11-12 16:07 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P . Berrange, Peter Maydell, Riku Voipio, Cole Robinson
Le 12/11/2019 à 15:25, Laurent Vivier a écrit :
> stime() has been withdrawn from glibc
> (12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.")
>
> Implement the target stime() syscall using host
> clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc.
>
> Tested qemu-ppc/x86_64 with:
>
> #include <time.h>
> #include <stdio.h>
>
> int main(void)
> {
> time_t t;
> int ret;
>
> /* date -u -d"2019-11-12T15:11:00" "+%s" */
> t = 1573571460;
> ret = stime(&t);
> printf("ret %d\n", ret);
> return 0;
> }
>
> # date; ./stime; date
> Tue Nov 12 14:18:32 UTC 2019
> ret 0
> Tue Nov 12 15:11:00 UTC 2019
>
> Buglink: https://bugs.launchpad.net/qemu/+bug/1852115
> Reported-by: Cole Robinson <crobinso@redhat.com>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
> linux-user/syscall.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index ab9d933e53af..c4dcdc94b10c 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -7763,10 +7763,12 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> #ifdef TARGET_NR_stime /* not on alpha */
> case TARGET_NR_stime:
> {
> - time_t host_time;
> - if (get_user_sal(host_time, arg1))
> + struct timespec ts;
> + ts.tv_nsec = 0;
> + if (get_user_sal(ts.tv_sec, arg1)) {
> return -TARGET_EFAULT;
> - return get_errno(stime(&host_time));
> + }
> + return get_errno(clock_settime(CLOCK_REALTIME, &ts));
> }
> #endif
> #ifdef TARGET_NR_alarm /* not on alpha */
>
Applied to my linux-user branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-11-12 16:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-12 14:25 [PATCH] linux-user: remove host stime() syscall Laurent Vivier
2019-11-12 14:28 ` Peter Maydell
2019-11-12 14:45 ` Cole Robinson
2019-11-12 16:07 ` Laurent Vivier
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).