[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/17] linux-user: move hppa fcntl definitions to hpp
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 05/17] linux-user: move hppa fcntl definitions to hppa/target_fcntl.h |
Date: |
Mon, 4 Jun 2018 17:20:03 +0200 |
No code change.
Signed-off-by: Laurent Vivier <address@hidden>
Acked-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
---
linux-user/hppa/target_fcntl.h | 31 +++++++++++++++++++++++++++++++
linux-user/syscall_defs.h | 34 +---------------------------------
2 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/linux-user/hppa/target_fcntl.h b/linux-user/hppa/target_fcntl.h
index aa282a5ce8..bd966a59b8 100644
--- a/linux-user/hppa/target_fcntl.h
+++ b/linux-user/hppa/target_fcntl.h
@@ -7,5 +7,36 @@
#ifndef HPPA_TARGET_FCNTL_H
#define HPPA_TARGET_FCNTL_H
+
+#define TARGET_O_NONBLOCK 000200004 /* HPUX has separate NDELAY & NONBLOCK
*/
+#define TARGET_O_APPEND 000000010
+#define TARGET_O_CREAT 000000400 /* not fcntl */
+#define TARGET_O_EXCL 000002000 /* not fcntl */
+#define TARGET_O_NOCTTY 000400000 /* not fcntl */
+#define TARGET_O_DSYNC 001000000
+#define TARGET_O_LARGEFILE 000004000
+#define TARGET_O_DIRECTORY 000010000 /* must be a directory */
+#define TARGET_O_NOFOLLOW 000000200 /* don't follow links */
+#define TARGET_O_NOATIME 004000000
+#define TARGET_O_CLOEXEC 010000000
+#define TARGET___O_SYNC 000100000
+#define TARGET_O_PATH 020000000
+
+#define TARGET_F_RDLCK 1
+#define TARGET_F_WRLCK 2
+#define TARGET_F_UNLCK 3
+
+#define TARGET_F_GETLK64 8 /* using 'struct flock64' */
+#define TARGET_F_SETLK64 9
+#define TARGET_F_SETLKW64 10
+
+#define TARGET_F_GETLK 5
+#define TARGET_F_SETLK 6
+#define TARGET_F_SETLKW 7
+#define TARGET_F_GETOWN 11 /* for sockets. */
+#define TARGET_F_SETOWN 12 /* for sockets. */
+#define TARGET_F_SETSIG 13 /* for sockets. */
+#define TARGET_F_GETSIG 14 /* for sockets. */
+
#include "../generic/fcntl.h"
#endif
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index d8318ebd27..46d2353254 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -2413,15 +2413,6 @@ struct target_statfs64 {
#define TARGET_F_SETLKW 7
#define TARGET_F_SETOWN 24 /* for sockets. */
#define TARGET_F_GETOWN 23 /* for sockets. */
-#elif defined(TARGET_HPPA)
-#define TARGET_F_RDLCK 1
-#define TARGET_F_WRLCK 2
-#define TARGET_F_UNLCK 3
-#define TARGET_F_GETLK 5
-#define TARGET_F_SETLK 6
-#define TARGET_F_SETLKW 7
-#define TARGET_F_GETOWN 11 /* for sockets. */
-#define TARGET_F_SETOWN 12 /* for sockets. */
#elif defined(TARGET_SPARC)
#define TARGET_F_RDLCK 1
#define TARGET_F_WRLCK 2
@@ -2433,19 +2424,10 @@ struct target_statfs64 {
#define TARGET_F_SETLKW 9
#endif
-#if defined(TARGET_HPPA)
-#define TARGET_F_SETSIG 13 /* for sockets. */
-#define TARGET_F_GETSIG 14 /* for sockets. */
-#endif
-
#if defined(TARGET_MIPS)
#define TARGET_F_GETLK64 33 /* using 'struct flock64' */
#define TARGET_F_SETLK64 34
#define TARGET_F_SETLKW64 35
-#elif defined(TARGET_HPPA)
-#define TARGET_F_GETLK64 8 /* using 'struct flock64' */
-#define TARGET_F_SETLK64 9
-#define TARGET_F_SETLKW64 10
#endif
#define TARGET_F_LINUX_SPECIFIC_BASE 1024
@@ -2456,21 +2438,7 @@ struct target_statfs64 {
#define TARGET_F_GETPIPE_SZ (TARGET_F_LINUX_SPECIFIC_BASE + 8)
#define TARGET_F_NOTIFY (TARGET_F_LINUX_SPECIFIC_BASE+2)
-#if defined(TARGET_HPPA)
-#define TARGET_O_NONBLOCK 000200004 /* HPUX has separate NDELAY & NONBLOCK
*/
-#define TARGET_O_APPEND 000000010
-#define TARGET_O_CREAT 000000400 /* not fcntl */
-#define TARGET_O_EXCL 000002000 /* not fcntl */
-#define TARGET_O_NOCTTY 000400000 /* not fcntl */
-#define TARGET_O_DSYNC 001000000
-#define TARGET_O_LARGEFILE 000004000
-#define TARGET_O_DIRECTORY 000010000 /* must be a directory */
-#define TARGET_O_NOFOLLOW 000000200 /* don't follow links */
-#define TARGET_O_NOATIME 004000000
-#define TARGET_O_CLOEXEC 010000000
-#define TARGET___O_SYNC 000100000
-#define TARGET_O_PATH 020000000
-#elif defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_AARCH64)
+#if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_AARCH64)
#define TARGET_O_DIRECTORY 040000 /* must be a directory */
#define TARGET_O_NOFOLLOW 0100000 /* don't follow links */
#define TARGET_O_DIRECT 0200000 /* direct disk access hint */
--
2.14.3
- [Qemu-devel] [PULL 07/17] linux-user: move mips/mips64 fcntl definitions to mips/target_fcntl.h, (continued)
- [Qemu-devel] [PULL 07/17] linux-user: move mips/mips64 fcntl definitions to mips/target_fcntl.h, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 06/17] linux-user: move arm/aarch64/m68k fcntl definitions to [arm|aarch64|m68k]/target_fcntl.h, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 01/17] syscall: replace strcpy() by g_strlcpy(), Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 12/17] linux-user: move sparc signal definitions to sparc/target_signal.h, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 13/17] linux-user: move mips signal definitions to mips/target_signal.h, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 11/17] linux-user: move generic signal definitions to generic/signal.h, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 16/17] linux-user: move hppa signal definitions to hppa/target_signal.h, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 02/17] linux-user: SPARC "rd %tick" can be used by user application, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 04/17] linux-user: move alpha fcntl definitions to alpha/target_fcntl.h, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 14/17] linux-user: move openrisc signal definitions to openrisc/target_signal.h, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 05/17] linux-user: move hppa fcntl definitions to hppa/target_fcntl.h,
Laurent Vivier <=
- [Qemu-devel] [PULL 08/17] linux-user: move ppc fcntl definitions to ppc/target_fcntl.h, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 17/17] linux-user: remove useless #if, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 15/17] linux-user: move alpha signal definitions to alpha/target_signal.h, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 03/17] linux-user: move generic fcntl definitions to generic/fcntl.h, Laurent Vivier, 2018/06/04
- [Qemu-devel] [PULL 10/17] linux-user: move get_sp_from_cpustate() to target_cpu.h, Laurent Vivier, 2018/06/04
- Re: [Qemu-devel] [PULL 00/17] Linux user for 3.0 patches, no-reply, 2018/06/04
- Re: [Qemu-devel] [PULL 00/17] Linux user for 3.0 patches, Peter Maydell, 2018/06/05