Re: [Qemu-devel] [PATCH 3/3] linux-user: correct timerfd_create syscall numbers

[Laurent Vivier]

Le 15/02/2016 15:00, address@hidden a écrit :
> From: Riku Voipio <address@hidden>
> 
> x86, m68k, ppc, sh4 and sparc failed to enable timerfd, because they
> didn't have timerfd_create system call defined. Instead Qemu
> defined timerfd syscall. Checking with kernel sources, it appears
> kernel developers reused timerfd syscall number with timerfd_create,
> presumably since no userspace called the old syscall number.
> 
> Reportd-by: Laurent Vivier <address@hidden>
> Signed-off-by: Riku Voipio <address@hidden>

Reviewed-by: Laurent Vivier <address@hidden>

> ---
>  linux-user/i386/syscall_nr.h   | 2 +-
>  linux-user/m68k/syscall_nr.h   | 2 +-
>  linux-user/ppc/syscall_nr.h    | 2 +-
>  linux-user/sh4/syscall_nr.h    | 2 +-
>  linux-user/sparc/syscall_nr.h  | 2 +-
>  linux-user/x86_64/syscall_nr.h | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/linux-user/i386/syscall_nr.h b/linux-user/i386/syscall_nr.h
> index fa3f0b4..bc1bc23 100644
> --- a/linux-user/i386/syscall_nr.h
> +++ b/linux-user/i386/syscall_nr.h
> @@ -324,7 +324,7 @@
>  #define TARGET_NR_epoll_pwait        319
>  #define TARGET_NR_utimensat          320
>  #define TARGET_NR_signalfd           321
> -#define TARGET_NR_timerfd            322
> +#define TARGET_NR_timerfd_create     322
>  #define TARGET_NR_eventfd            323
>  #define TARGET_NR_fallocate          324
>  #define TARGET_NR_timerfd_settime    325
> diff --git a/linux-user/m68k/syscall_nr.h b/linux-user/m68k/syscall_nr.h
> index a2daba0..4b50fb2 100644
> --- a/linux-user/m68k/syscall_nr.h
> +++ b/linux-user/m68k/syscall_nr.h
> @@ -317,7 +317,7 @@
>  #define TARGET_NR_epoll_pwait        315
>  #define TARGET_NR_utimensat          316
>  #define TARGET_NR_signalfd           317
> -#define TARGET_NR_timerfd            318
> +#define TARGET_NR_timerfd_create     318
>  #define TARGET_NR_eventfd            319
>  #define TARGET_NR_fallocate          320
>  #define TARGET_NR_timerfd_settime    321
> diff --git a/linux-user/ppc/syscall_nr.h b/linux-user/ppc/syscall_nr.h
> index 0a5fd54..46ed8a6 100644
> --- a/linux-user/ppc/syscall_nr.h
> +++ b/linux-user/ppc/syscall_nr.h
> @@ -319,7 +319,7 @@
>  #define TARGET_NR_epoll_pwait        303
>  #define TARGET_NR_utimensat          304
>  #define TARGET_NR_signalfd           305
> -#define TARGET_NR_timerfd            306
> +#define TARGET_NR_timerfd_create     306
>  #define TARGET_NR_eventfd            307
>  #define TARGET_NR_sync_file_range2   308
>  #define TARGET_NR_fallocate          309
> diff --git a/linux-user/sh4/syscall_nr.h b/linux-user/sh4/syscall_nr.h
> index bdf8742..5009984 100644
> --- a/linux-user/sh4/syscall_nr.h
> +++ b/linux-user/sh4/syscall_nr.h
> @@ -323,7 +323,7 @@
>  #define TARGET_NR_epoll_pwait        319
>  #define TARGET_NR_utimensat          320
>  #define TARGET_NR_signalfd           321
> -#define TARGET_NR_timerfd            322
> +#define TARGET_NR_timerfd_create     322
>  #define TARGET_NR_eventfd            323
>  #define TARGET_NR_fallocate          324
>  #define TARGET_NR_timerfd_settime    325
> diff --git a/linux-user/sparc/syscall_nr.h b/linux-user/sparc/syscall_nr.h
> index 5b582a5..732b105 100644
> --- a/linux-user/sparc/syscall_nr.h
> +++ b/linux-user/sparc/syscall_nr.h
> @@ -278,7 +278,7 @@
>  #define TARGET_NR_epoll_pwait        309
>  #define TARGET_NR_utimensat          310
>  #define TARGET_NR_signalfd           311
> -#define TARGET_NR_timerfd            312
> +#define TARGET_NR_timerfd_create     312
>  #define TARGET_NR_eventfd            313
>  #define TARGET_NR_fallocate          314
>  #define TARGET_NR_timerfd_settime    315
> diff --git a/linux-user/x86_64/syscall_nr.h b/linux-user/x86_64/syscall_nr.h
> index f00fa2b..16397b3 100644
> --- a/linux-user/x86_64/syscall_nr.h
> +++ b/linux-user/x86_64/syscall_nr.h
> @@ -281,7 +281,7 @@
>  #define TARGET_NR_utimensat          280
>  #define TARGET_NR_epoll_pwait        281
>  #define TARGET_NR_signalfd           282
> -#define TARGET_NR_timerfd            283
> +#define TARGET_NR_timerfd_create     283
>  #define TARGET_NR_eventfd            284
>  #define TARGET_NR_fallocate          285
>  #define TARGET_NR_timerfd_settime    286
>