Re: [Qemu-devel] [PATCH v7 1/7] linux-user: Fix TARGET_SIOCATMARK definition for Mips

[Laurent Vivier <laurent@vivier.eu>]

Le 19/09/2016 à 13:44, Aleksandar Markovic a écrit :
> From: Aleksandar Markovic <aleksandar.markovic@imgtec.com>
> 
> This patch fixes wrong definition of TARGET_SIOCATMARK for mips,
> alpha, and sh4.
> 
> The current definition is:
> 
>   #define SIOCATMARK      0x8905
> 
> while the correct definition is:
> 
>   #define SIOCATMARK      TARGET_IOR('s', 7, int)
> 
> See Linux kernel source file arch/mips/include/uapi/asm/sockios.h#L19
> for reference.
> 
> This patch also a fixes LTP test failure for test sockioctl01, for
> mips, alpha, and sh4.
> 
> Signed-off-by: Aleksandar Rikalo <aleksandar.rikalo@imgtec.com>
> Signed-off-by: Aleksandar Markovic <aleksandar.markovic@imgtec.com>

Reviewed-by: Laurent Vivier <laurent@vivier.eu>

> ---
>  linux-user/syscall_defs.h | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
> index c0c9b58..605496d 100644
> --- a/linux-user/syscall_defs.h
> +++ b/linux-user/syscall_defs.h
> @@ -898,7 +898,11 @@ struct target_pollfd {
>  #define TARGET_KDSETLED        0x4B32	/* set led state [lights, not flags] */
>  #define TARGET_KDSIGACCEPT     0x4B4E
>  
> +#if defined(TARGET_ALPHA) || defined(TARGET_MIPS) || defined(TARGET_SH4)
> +#define TARGET_SIOCATMARK      TARGET_IOR('s', 7, int)
> +#else
>  #define TARGET_SIOCATMARK      0x8905
> +#endif
>  
>  /* Networking ioctls */
>  #define TARGET_SIOCADDRT       0x890B          /* add routing table entry */
>