From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <laurent@vivier.eu>, Riku Voipio <riku.voipio@iki.fi>
Subject: [Qemu-devel] [PATCH 02/15] linux-user: move alpha fcntl definitions to alpha/target_fcntl.h
Date: Tue, 29 May 2018 21:41:54 +0200 [thread overview]
Message-ID: <20180529194207.31503-3-laurent@vivier.eu> (raw)
In-Reply-To: <20180529194207.31503-1-laurent@vivier.eu>
No code change.
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/alpha/target_fcntl.h | 29 +++++++++++++++++++++++++++++
linux-user/syscall_defs.h | 32 ++------------------------------
2 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/linux-user/alpha/target_fcntl.h b/linux-user/alpha/target_fcntl.h
index bb603ff28c..2617e73472 100644
--- a/linux-user/alpha/target_fcntl.h
+++ b/linux-user/alpha/target_fcntl.h
@@ -7,5 +7,34 @@
#ifndef ALPHA_TARGET_FCNTL_H
#define ALPHA_TARGET_FCNTL_H
+
+#define TARGET_O_NONBLOCK 04
+#define TARGET_O_APPEND 010
+#define TARGET_O_CREAT 01000 /* not fcntl */
+#define TARGET_O_TRUNC 02000 /* not fcntl */
+#define TARGET_O_EXCL 04000 /* not fcntl */
+#define TARGET_O_NOCTTY 010000 /* not fcntl */
+#define TARGET_O_DSYNC 040000
+#define TARGET_O_LARGEFILE 0 /* not necessary, always 64-bit */
+#define TARGET_O_DIRECTORY 0100000 /* must be a directory */
+#define TARGET_O_NOFOLLOW 0200000 /* don't follow links */
+#define TARGET_O_DIRECT 02000000 /* direct disk access hint */
+#define TARGET_O_NOATIME 04000000
+#define TARGET_O_CLOEXEC 010000000
+#define TARGET___O_SYNC 020000000
+#define TARGET_O_PATH 040000000
+
+#define TARGET_F_GETLK 7
+#define TARGET_F_SETLK 8
+#define TARGET_F_SETLKW 9
+#define TARGET_F_SETOWN 5 /* for sockets. */
+#define TARGET_F_GETOWN 6 /* for sockets. */
+
+#define TARGET_F_RDLCK 1
+#define TARGET_F_WRLCK 2
+#define TARGET_F_UNLCK 8
+#define TARGET_F_EXLCK 16
+#define TARGET_F_SHLCK 32
+
#include "../generic/fcntl.h"
#endif
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 9969f21ba1..d8318ebd27 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -2407,19 +2407,7 @@ struct target_statfs64 {
};
#endif
-#if defined(TARGET_ALPHA)
-#define TARGET_F_GETLK 7
-#define TARGET_F_SETLK 8
-#define TARGET_F_SETLKW 9
-#define TARGET_F_SETOWN 5 /* for sockets. */
-#define TARGET_F_GETOWN 6 /* for sockets. */
-
-#define TARGET_F_RDLCK 1
-#define TARGET_F_WRLCK 2
-#define TARGET_F_UNLCK 8
-#define TARGET_F_EXLCK 16
-#define TARGET_F_SHLCK 32
-#elif defined(TARGET_MIPS)
+#if defined(TARGET_MIPS)
#define TARGET_F_GETLK 14
#define TARGET_F_SETLK 6
#define TARGET_F_SETLKW 7
@@ -2468,23 +2456,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_ALPHA)
-#define TARGET_O_NONBLOCK 04
-#define TARGET_O_APPEND 010
-#define TARGET_O_CREAT 01000 /* not fcntl */
-#define TARGET_O_TRUNC 02000 /* not fcntl */
-#define TARGET_O_EXCL 04000 /* not fcntl */
-#define TARGET_O_NOCTTY 010000 /* not fcntl */
-#define TARGET_O_DSYNC 040000
-#define TARGET_O_LARGEFILE 0 /* not necessary, always 64-bit */
-#define TARGET_O_DIRECTORY 0100000 /* must be a directory */
-#define TARGET_O_NOFOLLOW 0200000 /* don't follow links */
-#define TARGET_O_DIRECT 02000000 /* direct disk access hint */
-#define TARGET_O_NOATIME 04000000
-#define TARGET_O_CLOEXEC 010000000
-#define TARGET___O_SYNC 020000000
-#define TARGET_O_PATH 040000000
-#elif defined(TARGET_HPPA)
+#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 */
--
2.14.3
next prev parent reply other threads:[~2018-05-29 19:42 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-29 19:41 [Qemu-devel] [PATCH 00/15] linux-user: move more definitions out of syscall_defs.h Laurent Vivier
2018-05-29 19:41 ` [Qemu-devel] [PATCH 01/15] linux-user: move generic fcntl definitions to generic/fcntl.h Laurent Vivier
2018-05-29 19:41 ` Laurent Vivier [this message]
2018-05-30 21:50 ` [Qemu-devel] [PATCH 02/15] linux-user: move alpha fcntl definitions to alpha/target_fcntl.h Richard Henderson
2018-05-29 19:41 ` [Qemu-devel] [PATCH 03/15] linux-user: move hppa fcntl definitions to hppa/target_fcntl.h Laurent Vivier
2018-05-30 21:51 ` Richard Henderson
2018-05-29 19:41 ` [Qemu-devel] [PATCH 04/15] linux-user: move arm/aarch64/m68k fcntl definitions to [arm|aarch64|m68k]/target_fcntl.h Laurent Vivier
2018-05-30 21:52 ` Richard Henderson
2018-05-29 19:41 ` [Qemu-devel] [PATCH 05/15] linux-user: move mips/mips64 fcntl definitions to mips/target_fcntl.h Laurent Vivier
2018-05-29 19:41 ` [Qemu-devel] [PATCH 06/15] linux-user: move ppc fcntl definitions to ppc/target_fcntl.h Laurent Vivier
2018-05-29 19:41 ` [Qemu-devel] [PATCH 07/15] linux-user: move sparc/sparc64 fcntl definitions to sparc/target_fcntl.h Laurent Vivier
2018-05-29 19:42 ` [Qemu-devel] [PATCH 08/15] linux-user: move get_sp_from_cpustate() to target_cpu.h Laurent Vivier
2018-05-30 21:59 ` Richard Henderson
2018-05-29 19:42 ` [Qemu-devel] [PATCH 09/15] linux-user: move generic signal definitions to generic/signal.h Laurent Vivier
2018-05-29 19:42 ` [Qemu-devel] [PATCH 10/15] linux-user: move sparc signal definitions to sparc/target_signal.h Laurent Vivier
2018-05-29 19:42 ` [Qemu-devel] [PATCH 11/15] linux-user: move mips signal definitions to mips/target_signal.h Laurent Vivier
2018-05-29 19:42 ` [Qemu-devel] [PATCH 12/15] linux-user: move openrisc signal definitions to openrisc/target_signal.h Laurent Vivier
2018-05-29 19:42 ` [Qemu-devel] [PATCH 13/15] linux-user: move alpha signal definitions to alpha/target_signal.h Laurent Vivier
2018-05-29 19:42 ` [Qemu-devel] [PATCH 14/15] linux-user: move hppa signal definitions to hppa/target_signal.h Laurent Vivier
2018-05-29 19:42 ` [Qemu-devel] [PATCH 15/15] linux-user: remove useless #if Laurent Vivier
2018-05-29 20:02 ` [Qemu-devel] [PATCH 00/15] linux-user: move more definitions out of syscall_defs.h no-reply
2018-05-30 22:06 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180529194207.31503-3-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=riku.voipio@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.