From: Aleksandar Markovic Date: Mon, 19 Sep 2016 11:44:40 +0000 (+0200) Subject: linux-user: Fix structure target_flock definition for Mips X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8a8001b14728baacaa3491f7f723b92a7376e421;p=qemu.git linux-user: Fix structure target_flock definition for Mips Structure flock is defined for Mips in a way different from any other platform. For reference, see Linux kernel source code files: arch/mips/include/uapi/asm/fcntl.h, line 63 (for Mips) include/uapi/asm-generic/fcntl.h, line 195 (for all other platforms) This patch fix this problem, by amending structure target_flock, for Mips only. Besides, this patch fixes LTP tests fcntl11, fcntl17, fcntl19, fcntl20, and fcntl21, which are currently failing, if executed in Qemu user mode for Mips platforms. Signed-off-by: Aleksandar Markovic Reviewed-by: Laurent Vivier Reviewed-by: Leon Alrae Acked-by: Riku Voipio Signed-off-by: Leon Alrae --- diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 925feda6a6..9fdbe865dc 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -2333,7 +2333,13 @@ struct target_flock { short l_whence; abi_long l_start; abi_long l_len; +#if defined(TARGET_MIPS) + abi_long l_sysid; +#endif int l_pid; +#if defined(TARGET_MIPS) + abi_long pad[4]; +#endif }; struct target_flock64 {