linux-user: remove host stime() syscall
diff mbox series

Message ID 20191112142556.6335-1-laurent@vivier.eu
State New
Headers show
Series
  • linux-user: remove host stime() syscall
Related show

Commit Message

Laurent Vivier Nov. 12, 2019, 2:25 p.m. UTC
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(-)

Comments

Peter Maydell Nov. 12, 2019, 2:28 p.m. UTC | #1
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
Cole Robinson Nov. 12, 2019, 2:45 p.m. UTC | #2
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
Laurent Vivier Nov. 12, 2019, 4:07 p.m. UTC | #3
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

Patch
diff mbox series

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 */