From patchwork Tue May 29 19:41:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 922345 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 40wPR42SJyz9s16 for ; Wed, 30 May 2018 05:48:16 +1000 (AEST) Received: from localhost ([::1]:34711 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNkbN-0008Rc-Up for incoming@patchwork.ozlabs.org; Tue, 29 May 2018 15:48:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNkVo-0004F0-Ao 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-0000S6-91 for qemu-devel@nongnu.org; Tue, 29 May 2018 15:42:28 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:60209) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fNkVk-0000QO-VN 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 0MQA9X-1fSRT91yLL-005ELz; Tue, 29 May 2018 21:42:16 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 29 May 2018 21:41:55 +0200 Message-Id: <20180529194207.31503-4-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:Y9zsL3ea7fStu7DoahaicuQKPhhLlQRKZlCPjVbz8O4iZ+XbQ+f DhVX9vaTbfJm7O9srZjaCaW5HIounwLOFh0u3qchIWQ0k6s7R1X4avgAMBeO9vRJiqHlsHN uO2GNBvvPugI5AVG9OeP2RK/yVItYjOr3SuruqoC2WiVXNeTUWp6DvB4p9gMvF2Klvxe++x k6VOGuH/wmpjEuc1620pA== X-UI-Out-Filterresults: notjunk:1; V01:K0:SeJvtTGYs9g=:Qi/IdmLazImWBwz2ZpmxDM hnZf5zMgH9M2xUQxz9tH+WNBpnS9tWA3Wh0pDopCL19OUD0vYmNonWEri8hF+pOk5sibrjNyp unvA4qWnMWqUkHKUVboLnlIPZ6/FHYr8QnYrPlOvk3W+SRrp+OCRBFS3pAUlnslZ5FJaRnESO u+qif0ISVVFitHE+yBUuJXemyPOQmzrUDcLcNTtPaf/NOYmhbWGwvur79j8UEuxtfIy9HuPUM AdAg+ZtouLIQFjrg4MxkFO+B06mAbqrx5nHKqWAH8VujXCDOjEU8WsG+x+gpG+xbkXz1sS1Mv X3PtncCx2xVtZJPSGVMVbXjTT+Iju5O3qhFPw5DxKbs1pAKwKBfvgaSISF7HYdvG0CQM+p60K bQKlgl8IN+0Mx3OAueMDMVbe79R0DlYnxx2O2DFwVulQeb5fiNRHmHDkZUJh+UcKoQb+gzAOa WEf4p6kobhguFfXlpcd+RNpZPaF4gyyKyN9XOAz1H7HKeXwWBHI7Z7jUhqv39LszB77RfNHPJ QLl66ERLeIp/r1hInhMj2U/mjTce6itRKTqO4YLUtnRjiBWkWPpBP9XHXcAgYoFo+u2Vm8hFB NOw+h8/cA4n1xxfg+tobmFHYXkhbbyraDgKWcoLS0hnYxb5tI/NXnTh0CzZLXTSARS7xhvARc oBmO7aJpU+sF5gYIXOEIP1dGyE4ENpZretMiyXhqoso+mdXGUgUVB85nnM/qW4nT/CTs= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PATCH 03/15] linux-user: move hppa fcntl definitions to hppa/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/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 */