Re: [Qemu-devel] [PATCH v2 05/28] linux-user: Renumber TARGET_QEMU_ESIGRETURN, make it not arch-specific

[Laurent Vivier]

Le 12/05/2016 à 19:47, Peter Maydell a écrit :
> From: Timothy E Baldwin <address@hidden>
> 
> Currently we define a QEMU-internal errno TARGET_QEMU_ESIGRETURN
> only on the MIPS and PPC targets; move this to errno_defs.h
> so it is available for all architectures, and renumber it to 513.
> We pick 513 because this is safe from future use as a system call return
> value: Linux uses it as ERESTART_NOINTR internally and never allows that
> errno to escape to userspace.
> 
> Signed-off-by: Timothy Edward Baldwin <address@hidden>
> Message-id: address@hidden
> [PMM: TARGET_ERESTARTSYS split out into preceding patch, add comment]
> Reviewed-by: Peter Maydell <address@hidden>
> Signed-off-by: Peter Maydell <address@hidden>

Reviewed-by: Laurent Vivier <address@hidden>

> ---
>  linux-user/errno_defs.h            | 9 +++++++++
>  linux-user/mips/target_syscall.h   | 4 ----
>  linux-user/mips64/target_syscall.h | 4 ----
>  linux-user/ppc/target_syscall.h    | 2 --
>  4 files changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/linux-user/errno_defs.h b/linux-user/errno_defs.h
> index b7a8c9f..65522c4 100644
> --- a/linux-user/errno_defs.h
> +++ b/linux-user/errno_defs.h
> @@ -147,3 +147,12 @@
>   * kernel uses for the same purpose.
>   */
>  #define TARGET_ERESTARTSYS     512     /* Restart system call (if 
> SA_RESTART) */
> +
> +/* QEMU internal, not visible to the guest. This is returned by the
> + * do_sigreturn() code after a successful sigreturn syscall, to indicate
> + * that it has correctly set the guest registers and so the main loop
> + * should not touch them. We use the value the guest would use for
> + * ERESTART_NOINTR (which is kernel internal) to guarantee that we won't
> + * clash with a valid guest errno now or in the future.
> + */
> +#define TARGET_QEMU_ESIGRETURN 513     /* Return from signal */
> diff --git a/linux-user/mips/target_syscall.h 
> b/linux-user/mips/target_syscall.h
> index 68db160..e8e305c 100644
> --- a/linux-user/mips/target_syscall.h
> +++ b/linux-user/mips/target_syscall.h
> @@ -222,10 +222,6 @@ struct target_pt_regs {
>  #define TARGET_ENOTRECOVERABLE 166     /* State not recoverable */
>  
>  
> -
> -/* Nasty hack: define a fake errno value for use by sigreturn.  */
> -#define TARGET_QEMU_ESIGRETURN 255
> -
>  #define UNAME_MACHINE "mips"
>  #define UNAME_MINIMUM_RELEASE "2.6.32"
>  
> diff --git a/linux-user/mips64/target_syscall.h 
> b/linux-user/mips64/target_syscall.h
> index 0e0c2d2..5789e86 100644
> --- a/linux-user/mips64/target_syscall.h
> +++ b/linux-user/mips64/target_syscall.h
> @@ -219,10 +219,6 @@ struct target_pt_regs {
>  #define TARGET_ENOTRECOVERABLE 166     /* State not recoverable */
>  
>  
> -
> -/* Nasty hack: define a fake errno value for use by sigreturn. */
> -#define TARGET_QEMU_ESIGRETURN 255
> -
>  #define UNAME_MACHINE "mips64"
>  #define UNAME_MINIMUM_RELEASE "2.6.32"
>  
> diff --git a/linux-user/ppc/target_syscall.h b/linux-user/ppc/target_syscall.h
> index 35cab59..7ca83c2 100644
> --- a/linux-user/ppc/target_syscall.h
> +++ b/linux-user/ppc/target_syscall.h
> @@ -53,8 +53,6 @@ struct target_revectored_struct {
>       abi_ulong __map[8];                     /* 256 bits */
>  };
>  
> -/* Nasty hack: define a fake errno value for use by sigreturn.  */
> -#define TARGET_QEMU_ESIGRETURN 255
>  
>  /*
>   * flags masks
>