From patchwork Tue May 29 19:41:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 922343 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 40wPPq5zq7z9s0q for ; Wed, 30 May 2018 05:47:11 +1000 (AEST) Received: from localhost ([::1]:34704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNkaL-0007nu-Dq for incoming@patchwork.ozlabs.org; Tue, 29 May 2018 15:47:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNkVp-0004Ff-5t 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-0000U6-Mt for qemu-devel@nongnu.org; Tue, 29 May 2018 15:42:29 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:49435) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fNkVm-0000TA-DS 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 0MJ0Dl-1fLGT50q53-002VKr; Tue, 29 May 2018 21:42:18 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 29 May 2018 21:41:59 +0200 Message-Id: <20180529194207.31503-8-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:Lbe8S4XqimfNqxBNivdPSFQkZkFffVCp2o4yK/+kS1QYdHWyuXo nyQx/gHry0BRYQLhgLssLngtb5L54osyQoy8apHSoW3+1ToWUTCGqeveOx58R4aFgROfnmX Rvx6fVj2sB8TQeK+DtjVGcftX8VQWR0U4gNgaIg827yuRMNDmOYjUd9Y6DNUEg4uuqQ+G1C xprrCSQ7eU81ZZ41C9pWA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Da5cv7lhXtc=:EqM3mcVTPpP1yqFK9tI2v/ MO1jw9C7pbwquCZiCu+3rP4mv1qkMt2OzYS0X27jcTslovkIN8oRKv/AJQCN3NToDrzCRjzPk B54q++kZaAuugXfFaEwItWtBrT9jq6REnPxDkBbC+Qa76ldUTPtU9xBqV4uR9hrouxZsfKdl8 sAXqVkKXEgQk6CS8Kf7LjAjTm4M47xtozLeu/ADIE3Oghym8U8isg+SV26FJNQVr3efGTITvv iVPahacUAs9/X+7aq8JyndCWZ/J2g2ykPeGxb534YbtmK4pUlNZwEUsDftqYK9H9D8NgXLtjk f4u2+f1ty6KhY43zJV3/I4Ked69vUThnsoJ3Q7hd10rRJceXaxw8BTbc0B2upBC1Pu9I4B9qJ W1s74l/ogxqxgzUJieZtJYHD01EAkhOwKTkVzin6XXblAqcVltGBuXy2ik3kgxsiVXh1rX/sa bQTqI+u/Z/H/uUOayIOExjMdddcogtWwHpanStOUoHGH4NN/NX4apVzfUw+LppF1cwFN1RPbh +nyRbnslB3Zuvuef5miw1ROrdwnDRqk4e1XcrBqCsBeXwwIcqKRA+wz7+DhGLcvHUPjOIJSAh e1bJi1iX3iNzlV74I5DNXJasQes9EGgUJ/3SB3LIk32ga6x1RHL19xQuVVRGrAkettYDcCpbO 5dyo+kpVjsevHI7/slX1XCB/29uy3LwzETHCIDLjHCT/506P9e+fi7OkG+xh0sQ7Ldts= 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 07/15] linux-user: move sparc/sparc64 fcntl definitions to sparc/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 --- linux-user/sparc/target_fcntl.h | 34 ++++++++++++++++++++++++++++++++++ linux-user/syscall_defs.h | 39 --------------------------------------- 2 files changed, 34 insertions(+), 39 deletions(-) diff --git a/linux-user/sparc/target_fcntl.h b/linux-user/sparc/target_fcntl.h index 35a753153b..c2532989e5 100644 --- a/linux-user/sparc/target_fcntl.h +++ b/linux-user/sparc/target_fcntl.h @@ -7,5 +7,39 @@ #ifndef SPARC_TARGET_FCNTL_H #define SPARC_TARGET_FCNTL_H + +#define TARGET_O_APPEND 0x0008 +#define TARGET_FASYNC 0x0040 /* fcntl, for BSD compatibility */ +#define TARGET_O_CREAT 0x0200 /* not fcntl */ +#define TARGET_O_TRUNC 0x0400 /* not fcntl */ +#define TARGET_O_EXCL 0x0800 /* not fcntl */ +#define TARGET_O_DSYNC 0x2000 +#define TARGET_O_NONBLOCK 0x4000 +# ifdef TARGET_SPARC64 +# define TARGET_O_NDELAY 0x0004 +# else +# define TARGET_O_NDELAY (0x0004 | TARGET_O_NONBLOCK) +# endif +#define TARGET_O_NOCTTY 0x8000 /* not fcntl */ +#define TARGET_O_LARGEFILE 0x40000 +#define TARGET_O_DIRECT 0x100000 /* direct disk access hint */ +#define TARGET_O_NOATIME 0x200000 +#define TARGET_O_CLOEXEC 0x400000 +#define TARGET___O_SYNC 0x800000 +#define TARGET_O_PATH 0x1000000 +#define TARGET___O_TMPFILE 0x2000000 + +#define TARGET_F_RDLCK 1 +#define TARGET_F_WRLCK 2 +#define TARGET_F_UNLCK 3 +#define TARGET_F_GETOWN 5 /* for sockets. */ +#define TARGET_F_SETOWN 6 /* for sockets. */ +#define TARGET_F_GETLK 7 +#define TARGET_F_SETLK 8 +#define TARGET_F_SETLKW 9 + +#define TARGET_ARCH_FLOCK_PAD abi_short __unused; +#define TARGET_ARCH_FLOCK64_PAD abi_short __unused; + #include "../generic/fcntl.h" #endif diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index a434edadf8..fbf1bf995a 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -2407,17 +2407,6 @@ struct target_statfs64 { }; #endif -#if defined(TARGET_SPARC) -#define TARGET_F_RDLCK 1 -#define TARGET_F_WRLCK 2 -#define TARGET_F_UNLCK 3 -#define TARGET_F_GETOWN 5 /* for sockets. */ -#define TARGET_F_SETOWN 6 /* for sockets. */ -#define TARGET_F_GETLK 7 -#define TARGET_F_SETLK 8 -#define TARGET_F_SETLKW 9 -#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) @@ -2426,34 +2415,6 @@ 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_SPARC) -#define TARGET_O_APPEND 0x0008 -#define TARGET_FASYNC 0x0040 /* fcntl, for BSD compatibility */ -#define TARGET_O_CREAT 0x0200 /* not fcntl */ -#define TARGET_O_TRUNC 0x0400 /* not fcntl */ -#define TARGET_O_EXCL 0x0800 /* not fcntl */ -#define TARGET_O_DSYNC 0x2000 -#define TARGET_O_NONBLOCK 0x4000 -# ifdef TARGET_SPARC64 -# define TARGET_O_NDELAY 0x0004 -# else -# define TARGET_O_NDELAY (0x0004 | TARGET_O_NONBLOCK) -# endif -#define TARGET_O_NOCTTY 0x8000 /* not fcntl */ -#define TARGET_O_LARGEFILE 0x40000 -#define TARGET_O_DIRECT 0x100000 /* direct disk access hint */ -#define TARGET_O_NOATIME 0x200000 -#define TARGET_O_CLOEXEC 0x400000 -#define TARGET___O_SYNC 0x800000 -#define TARGET_O_PATH 0x1000000 -#define TARGET___O_TMPFILE 0x2000000 -#endif - -#if defined(TARGET_SPARC) -#define TARGET_ARCH_FLOCK_PAD abi_short __unused; -#define TARGET_ARCH_FLOCK64_PAD abi_short __unused; -#endif - #include "target_fcntl.h" /* soundcard defines */