From patchwork Tue May 29 19:41:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 922341 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40wPMD0nx2z9s08 for ; Wed, 30 May 2018 05:44:56 +1000 (AEST) Received: from localhost ([::1]:34687 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNkY9-0005pd-Kx for incoming@patchwork.ozlabs.org; Tue, 29 May 2018 15:44:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNkVo-0004F6-ES for qemu-devel@nongnu.org; Tue, 29 May 2018 15:42:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNkVl-0000Si-Cx for qemu-devel@nongnu.org; Tue, 29 May 2018 15:42:28 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:35149) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fNkVl-0000QQ-4T for qemu-devel@nongnu.org; Tue, 29 May 2018 15:42:25 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LtRzc-1gM8fU0936-010xEq; Tue, 29 May 2018 21:42:16 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 29 May 2018 21:41:54 +0200 Message-Id: <20180529194207.31503-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180529194207.31503-1-laurent@vivier.eu> References: <20180529194207.31503-1-laurent@vivier.eu> X-Provags-ID: V03:K1:Z5vBkIhoo0mtD4o5rnJqldYyGUHTZoBWSn2oYmHgGR45V9ihL+A AnFaRGrXPUjU6j05GylxUaoBT1+DaLXy0XdhFWJOGfQjIb94JjbeOj2DEXdBswvBt5zG+AV HVpZKQ3VCAh4rNXeYAweOphmZyUcombi765p3PSb4mOSCapjHduAba1GT4xLwFN0JEeOfma gzdoUAHdfvGqQZLRBBn9Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:VtPIVCm/0CI=:0L/GsaP2W2ftFSm9JUs9Gv +r12sH0vy19DpFH55G++2ePn0rZaYEcC25CuGtLnnXRTrB4WosbgUsPfzGj7p9SS8jLzd1LhO s1aoi+rAKc+vMYkbxdL96wBsgbUBj6pHaTBYBAYhWUHHY7E6XvNUIc8aUVmo+XErgJuSwZJ0F 54/uakuZAUIQSBgoO7trids3maI3onJNODVYGSE8kh65lkDecyNI2nWk+iu9c5Zdc8s5bXK/Y +NgZRlPi7KAZTC/7rbnNRYgNjyij4gvlMgdl83fYsYix4DnuOPbCCX8AAHllreD6VWFLgQHT0 yIi7kLXTwJ+ZBnNfXopb5rprc30p3r0Pg2INgzaGysHxr5mzcCksvvnsXJwPCWxjBASVYM2js f1+EXcN3ja/hw6ZWuFxw7ct2xtvkalqOgzzrUXdPgV4OgzdW6zhnQXCQvgqFQc2VrRai7GUDe Ebwb7fkQIgQ0cA0XNUKpNES+LEpUU9r478dbOuZeuI3icPYQQnuFDlJDHDAATEG0ByF1r2YEK nkYUZGMZB6SX1NgR9HQn28MbuY5RiiQl/BtiB1Zzp+9q4syZp1R4iulbSnDw6mDCV+ay4Io3o uIlt7DLOeB2uZG3qV/VXZhpHD8+6ZG6m9IrOrPrv7qcari2ZyOrLlP10efImkntKM/k9Uiava 2jBrcq+f07VUYTu67+WdGMdx6Ajvh7bsstM2yksHO5Ngn+TaUd6iBEvE+MciObHTYPL8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PATCH 02/15] linux-user: move alpha fcntl definitions to alpha/target_fcntl.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" No code change. Signed-off-by: Laurent Vivier Acked-by: Richard Henderson --- 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 */