Re: [Qemu-devel] [PATCH v2 3/7] linux-user: Fix flock definition for mips64

From: Peter Maydell <peter.maydell@linaro.org>
To: Lena Djokic <Lena.Djokic@rt-rk.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>,
	Riku Voipio <riku.voipio@iki.fi>
Subject: Re: [Qemu-devel] [PATCH v2 3/7] linux-user: Fix flock definition for mips64
Date: Fri, 16 Dec 2016 14:51:26 +0000	[thread overview]
Message-ID: <CAFEAcA-HnaeUvS0Lv943ANtVVJ6rXNAXbupNjGgCr=XcThfCaw@mail.gmail.com> (raw)
In-Reply-To: <1480003738-8754-4-git-send-email-Lena.Djokic@rt-rk.com>

On 24 November 2016 at 16:08, Lena Djokic <Lena.Djokic@rt-rk.com> wrote:
> Mips64 uses generic flock structure.
> See /arch/mips/include/uapi/asm/fcntl.h#L63 for reference.
>
> Signed-off-by: Lena Djokic <Lena.Djokic@rt-rk.com>
> ---
>  linux-user/syscall_defs.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
> index 0b15466..099fd0e 100644
> --- a/linux-user/syscall_defs.h
> +++ b/linux-user/syscall_defs.h
> @@ -2363,7 +2363,7 @@ struct target_flock {
>      short l_whence;
>      abi_long l_start;
>      abi_long l_len;
> -#if defined(TARGET_MIPS)
> +#if defined(TARGET_MIPS) && (TARGET_ABI_BITS == 32)
>      abi_long l_sysid;
>  #endif
>      int l_pid;

Does the #if around the 'pad' field of this struct need adjusting too ?

thanks
-- PMM