From patchwork Tue May 29 19:41:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10436905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CF686602CC for ; Tue, 29 May 2018 19:53:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0F5A28236 for ; Tue, 29 May 2018 19:53:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B472B286F9; Tue, 29 May 2018 19:53:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1D78428236 for ; Tue, 29 May 2018 19:53:14 +0000 (UTC) Received: from localhost ([::1]:34735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNkgD-0003hq-AY for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 May 2018 15:53:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNkVp-0004Fg-65 for qemu-devel@nongnu.org; Tue, 29 May 2018 15:42:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNkVm-0000To-30 for qemu-devel@nongnu.org; Tue, 29 May 2018 15:42:29 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:37911) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fNkVl-0000RC-Q1 for qemu-devel@nongnu.org; Tue, 29 May 2018 15:42:26 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MJoUy-1fMe331RVU-0017MC; Tue, 29 May 2018 21:42:17 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 29 May 2018 21:41:57 +0200 Message-Id: <20180529194207.31503-6-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:m8BeRAyUIkSoL8AUcIfU1HOOVhrcI7UDl6/gftdU9XEqf9cu+Kb NZw6X2zF2arPSFir6UjSR127X1DQYFfIsTWAwbjv1ngku3XeMV8GBec36C3aFeItOgBLOou 9fBwHP/Dr48u6qjzsiO+l/fgRboEPzgqxtKaWmf+howBfOpdERAIpbSpYK9i0SoDEKjxCRQ xxOhZO1W+pC67vGocF6lg== X-UI-Out-Filterresults: notjunk:1; V01:K0:G1V5zG7w2Xc=:Okf9mK8ylKLqTyJiDXccIk spSr/LpJiU+DITxn6e895zfIo+NVhxU3CCHwf5ZU5HaUc0bQvhV7vwIEm84IwcaINlh4TmEwR VL3uwarARBrKIE2t63pY+IQaT9SJHXrg3KGtSJnmKf284jBXCNhT0GqzKQP4xh2OTocvaW9Ts IuiefH99nTaJ1iyu5ChbCyAyfoaiieicfd5l4qUkX6/zwE8z3a87kDeJQiL+VwSRYzmaM4Cjr ndx9jV0/jQXT4xwyX8d7VUQgZ2URrvqD84eiKxa7JqQWoDC5Bl4JApqK7U4RYiw/VSKVeFn03 PnSXdC3DJSSg+L38gCgKgjAiL8pSkndkV9kEZ3PEcccZjpKaB4XCRacPiCCTJvN7asCi3Gcr0 ZC3JSihWU4xBnVTjiof7JSQ1XJV+LsWXmhdnxZAFkELeJUEWABaeqiDrkhxaAS0r0NPSNsUBX VD05Fvo7gtjajZA8g8rnBq+ogy/RBjogOj20a0tEc5POu+rw9AeTwxLldR7jhXSpyj8jRenbl p3DQS1mde1eOabmRJId3XmDBF88YrGINXWrYfxhwVfR8KUkd573EXxrn/qX+eZbFhUJ6HeN4+ XDBTHqwsxY2LrZSzrT4Ukyk3ZISG2zH0lGMwOcG7XfLvv6fSMb/xTv1LGf42r73JN+kLkXCuk D0lSnZOyNJGDoP+8fGm1To9UP+YSOD1t35pHss37MLuUWF/Wo4VN2RFBmb2scWIHQTxY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH 05/15] linux-user: move mips/mips64 fcntl definitions to mips/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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP No code change. Signed-off-by: Laurent Vivier --- linux-user/mips/target_fcntl.h | 27 +++++++++++++++++++++++++++ linux-user/syscall_defs.h | 31 ++----------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/linux-user/mips/target_fcntl.h b/linux-user/mips/target_fcntl.h index 5404245068..000527cc95 100644 --- a/linux-user/mips/target_fcntl.h +++ b/linux-user/mips/target_fcntl.h @@ -7,5 +7,32 @@ #ifndef MIPS_TARGET_FCNTL_H #define MIPS_TARGET_FCNTL_H + +#define TARGET_O_APPEND 0x0008 +#define TARGET_O_DSYNC 0x0010 +#define TARGET_O_NONBLOCK 0x0080 +#define TARGET_O_CREAT 0x0100 /* not fcntl */ +#define TARGET_O_TRUNC 0x0200 /* not fcntl */ +#define TARGET_O_EXCL 0x0400 /* not fcntl */ +#define TARGET_O_NOCTTY 0x0800 /* not fcntl */ +#define TARGET_FASYNC 0x1000 /* fcntl, for BSD compatibility */ +#define TARGET_O_LARGEFILE 0x2000 /* allow large file opens */ +#define TARGET___O_SYNC 0x4000 +#define TARGET_O_DIRECT 0x8000 /* direct disk access hint */ + +#define TARGET_F_GETLK 14 +#define TARGET_F_SETLK 6 +#define TARGET_F_SETLKW 7 + +#define TARGET_F_SETOWN 24 /* for sockets. */ +#define TARGET_F_GETOWN 23 /* for sockets. */ + +#define TARGET_ARCH_FLOCK_PAD abi_long pad[4]; +#define TARGET_ARCH_FLOCK64_PAD + +#define TARGET_F_GETLK64 33 /* using 'struct flock64' */ +#define TARGET_F_SETLK64 34 +#define TARGET_F_SETLKW64 35 + #include "../generic/fcntl.h" #endif diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 3d13cdd654..44a590d2c9 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -2407,13 +2407,7 @@ struct target_statfs64 { }; #endif -#if defined(TARGET_MIPS) -#define TARGET_F_GETLK 14 -#define TARGET_F_SETLK 6 -#define TARGET_F_SETLKW 7 -#define TARGET_F_SETOWN 24 /* for sockets. */ -#define TARGET_F_GETOWN 23 /* for sockets. */ -#elif defined(TARGET_SPARC) +#if defined(TARGET_SPARC) #define TARGET_F_RDLCK 1 #define TARGET_F_WRLCK 2 #define TARGET_F_UNLCK 3 @@ -2424,12 +2418,6 @@ struct target_statfs64 { #define TARGET_F_SETLKW 9 #endif -#if defined(TARGET_MIPS) -#define TARGET_F_GETLK64 33 /* using 'struct flock64' */ -#define TARGET_F_SETLK64 34 -#define TARGET_F_SETLKW64 35 -#endif - #define TARGET_F_LINUX_SPECIFIC_BASE 1024 #define TARGET_F_SETLEASE (TARGET_F_LINUX_SPECIFIC_BASE + 0) #define TARGET_F_GETLEASE (TARGET_F_LINUX_SPECIFIC_BASE + 1) @@ -2438,19 +2426,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_MIPS) -#define TARGET_O_APPEND 0x0008 -#define TARGET_O_DSYNC 0x0010 -#define TARGET_O_NONBLOCK 0x0080 -#define TARGET_O_CREAT 0x0100 /* not fcntl */ -#define TARGET_O_TRUNC 0x0200 /* not fcntl */ -#define TARGET_O_EXCL 0x0400 /* not fcntl */ -#define TARGET_O_NOCTTY 0x0800 /* not fcntl */ -#define TARGET_FASYNC 0x1000 /* fcntl, for BSD compatibility */ -#define TARGET_O_LARGEFILE 0x2000 /* allow large file opens */ -#define TARGET___O_SYNC 0x4000 -#define TARGET_O_DIRECT 0x8000 /* direct disk access hint */ -#elif defined (TARGET_PPC) +#if defined (TARGET_PPC) #define TARGET_O_DIRECTORY 040000 /* must be a directory */ #define TARGET_O_NOFOLLOW 0100000 /* don't follow links */ #define TARGET_O_LARGEFILE 0200000 @@ -2481,9 +2457,6 @@ struct target_statfs64 { #if defined(TARGET_SPARC) #define TARGET_ARCH_FLOCK_PAD abi_short __unused; #define TARGET_ARCH_FLOCK64_PAD abi_short __unused; -#elif defined(TARGET_MIPS) -#define TARGET_ARCH_FLOCK_PAD abi_long pad[4]; -#define TARGET_ARCH_FLOCK64_PAD #endif #include "target_fcntl.h"