From patchwork Thu May 10 22:26:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 911591 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 40hnvg4BsLz9s19 for ; Fri, 11 May 2018 08:29:19 +1000 (AEST) Received: from localhost ([::1]:35827 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGu3p-0006lp-7k for incoming@patchwork.ozlabs.org; Thu, 10 May 2018 18:29:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGu1C-00056p-Bi for qemu-devel@nongnu.org; Thu, 10 May 2018 18:26:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGu1A-0007rz-C8 for qemu-devel@nongnu.org; Thu, 10 May 2018 18:26:34 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:47713) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGu1A-0007re-3B for qemu-devel@nongnu.org; Thu, 10 May 2018 18:26:32 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue007 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LuWn6-1eH8Sb42CG-00zmZQ; Fri, 11 May 2018 00:26:14 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 11 May 2018 00:26:00 +0200 Message-Id: <20180510222601.19944-5-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180510222601.19944-1-laurent@vivier.eu> References: <20180510222601.19944-1-laurent@vivier.eu> X-Provags-ID: V03:K1:7Y2zYXKtUZJdMV3IGSym403aO7yFCEXyFZFgNj2VEiDcZCCC8Nu gn+oha4Yv0I7qlZMgpkTs3Nq8BfeBqQBBSbfOwDsIOA/kA83HxD+dR1Uxo/gmzxM3b9UI/x P1U50eo56m5Uw+QG66nS2RC0Zz5oPfIHRGzjStKHLxS/HFQ1lEao/sLgN+uf1io+WZZ5fBn N71758A80KoP9+hy1LA4w== X-UI-Out-Filterresults: notjunk:1; V01:K0:x+v0C3kAPyk=:upQJvKzf+Ut5Mh2SIqf1qw qORWDZoByMIcNhN7sVRW7Q0bYh4X9HwsRhXLafzgtm1YfiuUrUySMJn8uzqX2lge9aT4xTczL hY7WpB5HqBnjj7bWBQp6/yeIgZW6GMned78EWycfGirZzxjbgQdOkNF0njCZgzphtFXQBiBWM CDkxyxJ06ngiUDt0a+gQYNJsOt2ZN5rG93hAbwgwNl1bhordKPu7Ybw9ZHQ5iICXltlawZ6fD 2m7mpFrjdPFlmnhV8N/P5NYreeoOtdKqhN1w0hDKWA91jOk+MmkyAZHhRJFgIy89Gu7FGMh3S mvwub1tXEN/bUiRX+XKry9JsKn+8/gnbcuaXi8KcKEADlhOusgLB/HYblVosnkeGNsWyynM3x D05k1rnZ0fMC7xGafrb8hP3BVI1OEu5x0dg5FrWDwCx9jv37fft0Xc7hwgOUlnyESE73GV8RP 4xK6I2IWTNl7NCDUhwo3WaJDe2oV5Lz/tjWrKdcdmzSMAt53AuS0b4vKtW7P31PZE/AvIsB9I usOEKNj0oB//GECyPFXANKaYkz4UHS4PvY01k+NWL7J/JWYMXaq0Py73Z4pg92w9EYHITCcZF qEm5AENLtkutlyngNq8JK+mVPJ+ac8XErn4oUNCYbKym9KwbaDgIJwGu8vOjPDh4dpVbb2ItB Clr9IdtQxI7iNhPlHuPBfVzeYtrAtda5MJEKIgFeoo33w6f7nl2zMm5gOMJsXeund2Bc= 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 4/5] linux-user: move ppc socket.h definitions to ppc/sockbits.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: Mark Cave-Ayland , Riku Voipio , Yongbok Kim , Laurent Vivier , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" No code change. Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell --- linux-user/ppc/sockbits.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++ linux-user/socket.h | 11 +-------- 2 files changed, 59 insertions(+), 10 deletions(-) create mode 100644 linux-user/ppc/sockbits.h diff --git a/linux-user/ppc/sockbits.h b/linux-user/ppc/sockbits.h new file mode 100644 index 0000000000..7561529395 --- /dev/null +++ b/linux-user/ppc/sockbits.h @@ -0,0 +1,58 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation, or (at your option) any + * later version. See the COPYING file in the top-level directory. + */ + +#ifndef PPC_SOCKBITS_H +#define PPC_SOCKBITS_H + +#define TARGET_SO_PASSSEC 34 + +/* For setsockopt(2) */ +#define TARGET_SOL_SOCKET 1 + +#define TARGET_SO_DEBUG 1 +#define TARGET_SO_REUSEADDR 2 +#define TARGET_SO_TYPE 3 +#define TARGET_SO_ERROR 4 +#define TARGET_SO_DONTROUTE 5 +#define TARGET_SO_BROADCAST 6 +#define TARGET_SO_SNDBUF 7 +#define TARGET_SO_RCVBUF 8 +#define TARGET_SO_SNDBUFFORCE 32 +#define TARGET_SO_RCVBUFFORCE 33 +#define TARGET_SO_KEEPALIVE 9 +#define TARGET_SO_OOBINLINE 10 +#define TARGET_SO_NO_CHECK 11 +#define TARGET_SO_PRIORITY 12 +#define TARGET_SO_LINGER 13 +#define TARGET_SO_BSDCOMPAT 14 +/* To add :#define TARGET_SO_REUSEPORT 15 */ +#define TARGET_SO_RCVLOWAT 16 +#define TARGET_SO_SNDLOWAT 17 +#define TARGET_SO_RCVTIMEO 18 +#define TARGET_SO_SNDTIMEO 19 +#define TARGET_SO_PASSCRED 20 +#define TARGET_SO_PEERCRED 21 + +/* Security levels - as per NRL IPv6 - don't actually do anything */ +#define TARGET_SO_SECURITY_AUTHENTICATION 22 +#define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 23 +#define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 24 + +#define TARGET_SO_BINDTODEVICE 25 + +/* Socket filtering */ +#define TARGET_SO_ATTACH_FILTER 26 +#define TARGET_SO_DETACH_FILTER 27 + +#define TARGET_SO_PEERNAME 28 +#define TARGET_SO_TIMESTAMP 29 +#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP + +#define TARGET_SO_ACCEPTCONN 30 + +#define TARGET_SO_PEERSEC 31 +#endif diff --git a/linux-user/socket.h b/linux-user/socket.h index 8eb62ea3f2..3eceb6534e 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -1,6 +1,6 @@ #if defined(TARGET_MIPS) || defined(TARGET_HPPA) || defined(TARGET_ALPHA) || \ - defined(TARGET_SPARC) + defined(TARGET_SPARC) || defined(TARGET_PPC) #include "sockbits.h" #else #define TARGET_SO_PASSSEC 34 @@ -25,21 +25,12 @@ #define TARGET_SO_LINGER 13 #define TARGET_SO_BSDCOMPAT 14 /* To add :#define TARGET_SO_REUSEPORT 15 */ -#if defined(TARGET_PPC) - #define TARGET_SO_RCVLOWAT 16 - #define TARGET_SO_SNDLOWAT 17 - #define TARGET_SO_RCVTIMEO 18 - #define TARGET_SO_SNDTIMEO 19 - #define TARGET_SO_PASSCRED 20 - #define TARGET_SO_PEERCRED 21 -#else #define TARGET_SO_PASSCRED 16 #define TARGET_SO_PEERCRED 17 #define TARGET_SO_RCVLOWAT 18 #define TARGET_SO_SNDLOWAT 19 #define TARGET_SO_RCVTIMEO 20 #define TARGET_SO_SNDTIMEO 21 -#endif /* Security levels - as per NRL IPv6 - don't actually do anything */ #define TARGET_SO_SECURITY_AUTHENTICATION 22