Re: [PATCH] linux-user: remove host stime() syscall

[Laurent Vivier]

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 <address@hidden>
> Signed-off-by: Laurent Vivier <address@hidden>
> ---
>  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