From patchwork Wed May 16 20:55:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 914932 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 40mRb60cLLz9s0q for ; Thu, 17 May 2018 06:57:38 +1000 (AEST) Received: from localhost ([::1]:40070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3UN-0000PX-Oc for incoming@patchwork.ozlabs.org; Wed, 16 May 2018 16:57:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3Td-0000NC-DW for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJ3Ta-00049l-Aw for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:49 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:57113) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJ3Ta-00049B-1L for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:46 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MEEDQ-1f3fG1158y-00FVdq; Wed, 16 May 2018 22:56:05 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 16 May 2018 22:55:42 +0200 Message-Id: <20180516205543.29305-8-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180516205543.29305-1-laurent@vivier.eu> References: <20180516205543.29305-1-laurent@vivier.eu> X-Provags-ID: V03:K1:gkrK/hX/RaZ1Z85CIRxnLAdrfZ+IWekjBnLWYLoZuQco01PRYTa fo9Z54UQoxGo2cRA++6iDFpLVvZxwHb5txImXj+B3dW1AUSSpOhYJ8mO0DYbFacTZZua2o3 ir64B4gYORNrPB4I3zvC8uInVP/JOqH54ECOYoF/H7/+iThT8EA5osKmkKM+Oly63qkgAvw tD1gkV73ZbQbe4xBE+mIQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:IjApcl5jhI4=:uLPmBveMhtTj9rFqzoofwY 6GvSsvCLYxDCzRBcMgnYMjGM4jQEWGXqwBd12y0CZNFyjdAVbvb6NO5U6AyQfdc3GLvY3m3WZ tagDRa81yF5LfHHsR/Nka9lNKq74tsJUGyjaLlwK5EEz9zGAsFqTQdUKETCbOqD1ly11E6z1I rcF/v+dFwcZV30vcAfjx77NgC0OtfpEeVMpAyOTRilsShWvR/mic5upxWq+atZIcl78YjwzXk SF2TB0u4Hvkq9wkqCTAFqfir/C08yFbTIfjxI2A4l/49rlgag0P4N3KOgwWncUdR4LLKb3biw 89WW+pKCa5RgxgB6eFfNTy5v9MmgqpUYqhUNLJuxwzaS6VkOWbosxbphD1KrSTMW68xpsccdx QgZiyhR7p7M5aRVTpAdOUkgR9I0mEnThhLhT6LHp7pZWe1I+8EAZ3cwF9N0p+I0n4mOTa10nR s51CW4HseneL/f3WPRbEXxQ1fWY7tUNA3Feh4chok3moWJo9VOcuLiHeE4SlDsvpCUS9Qud66 +sHgdB9wX7T+IMf9I4+QSAkSbr8RkqrjIxkKAH8Jvi6qYI2Nvl51G6tzklHDfOe61W13496IE mlYKvgeXwJZL/Up9iSooEQqRwddeHPDbMFq3kJa+pBE43s6HJyiR7y/Rrre+cObXYOrSyAmGv fvQKya1DUWe1GyJLZ49g0xefIzj3HxvSgTK8XI+Z58cttB3YMAIV/QuIMKfJxcRs73YQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PATCH v2 7/8] linux-user: copy sparc/sockbits.h definitions from linux 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: Peter Maydell , Riku Voipio , Mark Cave-Ayland , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Values defined for sparc are not correct. Copy the content of "arch/sparc/include/uapi/asm/socket.h" to fix them. Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell --- linux-user/sparc/sockbits.h | 131 +++++++++++++++++++++++++++++++------------- 1 file changed, 92 insertions(+), 39 deletions(-) diff --git a/linux-user/sparc/sockbits.h b/linux-user/sparc/sockbits.h index 6434b07033..0a822e3e1f 100644 --- a/linux-user/sparc/sockbits.h +++ b/linux-user/sparc/sockbits.h @@ -8,51 +8,104 @@ #ifndef SPARC_SOCKBITS_H #define SPARC_SOCKBITS_H -#define TARGET_SO_PASSSEC 31 - /* 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_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 +#define TARGET_SOL_SOCKET 0xffff -/* 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_DEBUG 0x0001 +#define TARGET_SO_PASSCRED 0x0002 +#define TARGET_SO_REUSEADDR 0x0004 +#define TARGET_SO_KEEPALIVE 0x0008 +#define TARGET_SO_DONTROUTE 0x0010 +#define TARGET_SO_BROADCAST 0x0020 +#define TARGET_SO_PEERCRED 0x0040 +#define TARGET_SO_LINGER 0x0080 +#define TARGET_SO_OOBINLINE 0x0100 +#define TARGET_SO_REUSEPORT 0x0200 +#define TARGET_SO_BSDCOMPAT 0x0400 +#define TARGET_SO_RCVLOWAT 0x0800 +#define TARGET_SO_SNDLOWAT 0x1000 +#define TARGET_SO_RCVTIMEO 0x2000 +#define TARGET_SO_SNDTIMEO 0x4000 +#define TARGET_SO_ACCEPTCONN 0x8000 + +#define TARGET_SO_SNDBUF 0x1001 +#define TARGET_SO_RCVBUF 0x1002 +#define TARGET_SO_SNDBUFFORCE 0x100a +#define TARGET_SO_RCVBUFFORCE 0x100b +#define TARGET_SO_ERROR 0x1007 +#define TARGET_SO_TYPE 0x1008 +#define TARGET_SO_PROTOCOL 0x1028 +#define TARGET_SO_DOMAIN 0x1029 + +/* Linux specific, keep the same. */ +#define TARGET_SO_NO_CHECK 0x000b +#define TARGET_SO_PRIORITY 0x000c -#define TARGET_SO_BINDTODEVICE 25 +#define TARGET_SO_BINDTODEVICE 0x000d -/* Socket filtering */ -#define TARGET_SO_ATTACH_FILTER 26 -#define TARGET_SO_DETACH_FILTER 27 +#define TARGET_SO_ATTACH_FILTER 0x001a +#define TARGET_SO_DETACH_FILTER 0x001b +#define TARGET_SO_GET_FILTER TARGET_SO_ATTACH_FILTER -#define TARGET_SO_PEERNAME 28 -#define TARGET_SO_TIMESTAMP 29 +#define TARGET_SO_PEERNAME 0x001c +#define TARGET_SO_TIMESTAMP 0x001d #define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP -#define TARGET_SO_ACCEPTCONN 30 +#define TARGET_SO_PEERSEC 0x001e +#define TARGET_SO_PASSSEC 0x001f +#define TARGET_SO_TIMESTAMPNS 0x0021 +#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS + +#define TARGET_SO_MARK 0x0022 + +#define TARGET_SO_TIMESTAMPING 0x0023 +#define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING + +#define TARGET_SO_RXQ_OVFL 0x0024 + +#define TARGET_SO_WIFI_STATUS 0x0025 +#define TARGET_SCM_WIFI_STATUS TARGET_SO_WIFI_STATUS +#define TARGET_SO_PEEK_OFF 0x0026 + +/* Instruct lower device to use last 4-bytes of skb data as FCS */ +#define TARGET_SO_NOFCS 0x0027 + +#define TARGET_SO_LOCK_FILTER 0x0028 + +#define TARGET_SO_SELECT_ERR_QUEUE 0x0029 + +#define TARGET_SO_BUSY_POLL 0x0030 + +#define TARGET_SO_MAX_PACING_RATE 0x0031 -#define TARGET_SO_PEERSEC 31 +#define TARGET_SO_BPF_EXTENSIONS 0x0032 + +#define TARGET_SO_INCOMING_CPU 0x0033 + +#define TARGET_SO_ATTACH_BPF 0x0034 +#define TARGET_SO_DETACH_BPF TARGET_SO_DETACH_FILTER + +#define TARGET_SO_ATTACH_REUSEPORT_CBPF 0x0035 +#define TARGET_SO_ATTACH_REUSEPORT_EBPF 0x0036 + +#define TARGET_SO_CNX_ADVICE 0x0037 + +#define TARGET_SCM_TIMESTAMPING_OPT_STATS 0x0038 + +#define TARGET_SO_MEMINFO 0x0039 + +#define TARGET_SO_INCOMING_NAPI_ID 0x003a + +#define TARGET_SO_COOKIE 0x003b + +#define TARGET_SCM_TIMESTAMPING_PKTINFO 0x003c + +#define TARGET_SO_PEERGROUPS 0x003d + +#define TARGET_SO_ZEROCOPY 0x003e + +/* Security levels - as per NRL IPv6 - don't actually do anything */ +#define TARGET_SO_SECURITY_AUTHENTICATION 0x5001 +#define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002 +#define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 0x5004 #endif