diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-03 17:22:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-03 17:22:06 +0100 |
| commit | 2b40d231ae49f7d91c253cd57bce627b4f4be8f0 (patch) | |
| tree | 45bec4528751b0b17915f31f1c62e5113da96019 /linux-user/generic/fcntl.h | |
| parent | 374f63f6810a2f99254cdf32af67035d951301c8 (diff) | |
| parent | 01154f792d254ae60a8a7ed6b363f1ed9a511204 (diff) | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.1-pull-request' into staging
Add statx
Fix netlink with IFLA_BR_MULTI_BOOLOPT
Fix mips (EXCP_FPE, struct flock)
# gpg: Signature made Tue 02 Jul 2019 16:05:18 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-4.1-pull-request:
linux-user: move QEMU_IFLA_BR_MULTI_BOOLOPT to the good function
linux-user: Handle EXCP_FPE properly for MIPS
linux-user: Introduce TARGET_HAVE_ARCH_STRUCT_FLOCK
linux-user: Fix target_flock structure for MIPS O64 ABI
linux-user: Add support for strace for statx() syscall
linux-user: Add support for translation of statx() syscall
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/generic/fcntl.h')
| -rw-r--r-- | linux-user/generic/fcntl.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linux-user/generic/fcntl.h b/linux-user/generic/fcntl.h index a775a491e9..9f727d4df2 100644 --- a/linux-user/generic/fcntl.h +++ b/linux-user/generic/fcntl.h @@ -120,6 +120,7 @@ struct target_f_owner_ex { #define TARGET_F_SHLCK 8 #endif +#ifndef TARGET_HAVE_ARCH_STRUCT_FLOCK #ifndef TARGET_ARCH_FLOCK_PAD #define TARGET_ARCH_FLOCK_PAD #endif @@ -129,13 +130,12 @@ 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; TARGET_ARCH_FLOCK_PAD }; +#endif +#ifndef TARGET_HAVE_ARCH_STRUCT_FLOCK64 #ifndef TARGET_ARCH_FLOCK64_PAD #define TARGET_ARCH_FLOCK64_PAD #endif @@ -149,3 +149,5 @@ struct target_flock64 { TARGET_ARCH_FLOCK64_PAD }; #endif + +#endif |