Commit bf913672 authored by Aleksandar Markovic's avatar Aleksandar Markovic Committed by Laurent Vivier
Browse files

linux-user: Fix target_flock structure for MIPS O64 ABI 



Among MIPS ABIs, only MIPS O32 and N32 have special (different
than other architectures) definition of structure flock in kernel.

Bring target_flock definition in QEMU for MIPS O64 ABI to the
correct state, which is currently different than the most common
definition, and it should actually be the same.

Reported-by: default avatarDragan Mladjenovic <dmladjenovic@wavecomp.com>
Signed-off-by: default avatarAleksandar Markovic <amarkovic@wavecomp.com>
Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
Message-Id: <1561718618-20218-4-git-send-email-aleksandar.markovic@rt-rk.com>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent d42744fe

linux-user/generic/fcntl.h

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,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;

linux-user/mips/target_fcntl.h

+4 −0
Original line number Diff line number Diff line
@@ -27,7 +27,11 @@ 
#define TARGET_F_SETOWN        24       /*  for sockets. */

#define TARGET_F_GETOWN        23       /*  for sockets. */



#if (TARGET_ABI_BITS == 32)

#define TARGET_ARCH_FLOCK_PAD abi_long pad[4];

#else

#define TARGET_ARCH_FLOCK_PAD

#endif

#define TARGET_ARCH_FLOCK64_PAD



#define TARGET_F_GETLK64       33      /*  using 'struct flock64' */