[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v13 3/5] linux-user: Fix flock structure for MIPS O6
From: |
Aleksandar Markovic |
Subject: |
[Qemu-devel] [PATCH v13 3/5] linux-user: Fix flock structure for MIPS O64 ABI |
Date: |
Thu, 27 Jun 2019 17:11:36 +0200 |
From: Aleksandar Markovic <address@hidden>
Only MIPS O32 and N32 have special (different than other
architectures) definition of structure flock in kernel.
Bring flock definition for MIPS O64 ABI to the correct state.
Reported-by: Dragan Mladjenovic <address@hidden>
Signed-off-by: Aleksandar Markovic <address@hidden>
---
linux-user/generic/fcntl.h | 2 +-
linux-user/mips/target_fcntl.h | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/linux-user/generic/fcntl.h b/linux-user/generic/fcntl.h
index a775a49..1b48dde 100644
--- a/linux-user/generic/fcntl.h
+++ b/linux-user/generic/fcntl.h
@@ -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;
diff --git a/linux-user/mips/target_fcntl.h b/linux-user/mips/target_fcntl.h
index 000527c..795bba7 100644
--- a/linux-user/mips/target_fcntl.h
+++ b/linux-user/mips/target_fcntl.h
@@ -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' */
--
2.7.4
- [Qemu-devel] [PATCH v13 0/5] linux-user: A set of miscellaneous patches, Aleksandar Markovic, 2019/06/27
- [Qemu-devel] [PATCH v13 5/5] linux-user: Handle EXCP_FPE properly for MIPS, Aleksandar Markovic, 2019/06/27
- [Qemu-devel] [PATCH v13 4/5] linux-user: Introduce TARGET_HAVE_ARCH_STRUCT_FLOCK, Aleksandar Markovic, 2019/06/27
- [Qemu-devel] [PATCH v13 1/5] linux-user: Add support for translation of statx() syscall, Aleksandar Markovic, 2019/06/27
- [Qemu-devel] [PATCH v13 3/5] linux-user: Fix flock structure for MIPS O64 ABI,
Aleksandar Markovic <=
- [Qemu-devel] [PATCH v13 2/5] linux-user: Add support for strace for statx() syscall, Aleksandar Markovic, 2019/06/27
- Re: [Qemu-devel] [PATCH v13 0/5] linux-user: A set of miscellaneous patches, no-reply, 2019/06/27
- Re: [Qemu-devel] [PATCH v13 0/5] linux-user: A set of miscellaneous patches, no-reply, 2019/06/27