From nobody Thu Apr 25 06:49:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526504310740489.0479801583243; Wed, 16 May 2018 13:58:30 -0700 (PDT) Received: from localhost ([::1]:40128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3VF-0001Hb-OZ for importer@patchew.org; Wed, 16 May 2018 16:58:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3TK-00006j-Uz for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJ3TH-0003wP-Py for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:31 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:42951) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJ3TH-0003vZ-FL for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:27 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MFcKD-1f53N80OO5-00Egh5; Wed, 16 May 2018 22:55:55 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 16 May 2018 22:55:36 +0200 Message-Id: <20180516205543.29305-2-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> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:yHfPouOPNJTKCA1VqJAIZ8jC+fr5jWca+es6GBtwYdqkqrHo5Zp lc2ueQcNtIoOuuvlnQNFx11+CKFjs5XTEZrFTd0eBe/81V+1+Uq4qFYcOwZ2Jc6b8NorVhO ulBLkuhDuk97/pS1G90bBhgtjvCok+iYAJa6XmOvgsXNFZIlbHtEj4EYuKIapc+SPyy+rqB kxluv51GRkVOEOzilLfcg== X-UI-Out-Filterresults: notjunk:1;V01:K0:Xrf2Gc/1e/w=:IeP2eLXfnFkrfuO4Uq2VbA 5bSAMg5gXxaPAuiJDN2yGzPnZoK+8qtMUpSjDZowkCyoJm0Ht5M4xXu4CGJ4EsJCjRHiu/0ct I+l5kqOZbd68cMZ2PJ7PxJNlyyDUmss5O3hftQxIYRo02ThzVeDWVz/nfJSCZrMLCn3uLnjpK xf8yVURPLPQxc3QM0QtlalN/mgEVH6sZNbQJPVHCDClDDSiLdG8MXKR6ROYYG11Qs9WkuOUcp khF+aZaUfy+EMG7hAZEdSeIwJytVO7CpCGHXFYj2zyRGTWz0j7yyX3i6+qDzSetIfg2piI9N1 0+bMEqXfeNdIsYUBM5Cj/HIq0Vvy5vVWcAGWbfm94o/CgXD1psAAFER4rsHK00b0X1rbyLhQR gJjAlDW8Yckr4yuyyt8aTK92+EizavRYobTz9h+5Pu8BC9mS015ERKtk08DBzy9KjyUyiuLFA MTm9alCsjmmKvceuYcfQFvU9PmZmPLE5KB/sxEmFtcdajGxvWvfwsUPJyeI8VKAQ9WqbMzX9R DOREno6D43Gh4GosE8XarGHFPIEcS4M6GpLGrcX7yz/BA3fMi0idppU7CTz6qiJNeuOOZs6id R0acWusgH9As5Irt89nIUAphrkXbWDWsLrQgkJxzCFyJqD7V2+yAwcxs3cIa8fd33b9VoO4Ca mJZq42a7bUONM0pw0q61VpW83isZSqW61y+hhrVwaKjYlau8V3ua0mCDl1XuSEvgqjMZFYSV6 cpAy+c4wyKawIK09 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PATCH v2 1/8] linux-user: move mips socket.h definitions to mips/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: Peter Maydell , Riku Voipio , Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 No code change. Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/mips/sockbits.h | 110 +++++++++++++++++++++++++++++++++++++++= ++++ linux-user/mips64/sockbits.h | 1 + linux-user/socket.h | 106 +--------------------------------------= -- 3 files changed, 113 insertions(+), 104 deletions(-) create mode 100644 linux-user/mips/sockbits.h create mode 100644 linux-user/mips64/sockbits.h diff --git a/linux-user/mips/sockbits.h b/linux-user/mips/sockbits.h new file mode 100644 index 0000000000..3fe5ac88e7 --- /dev/null +++ b/linux-user/mips/sockbits.h @@ -0,0 +1,110 @@ +/* + * 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 MIPS_SOCKBITS_H +#define MIPS_SOCKBITS_H +/* MIPS special values for constants */ + +/* + * For setsockopt(2) + * + * This defines are ABI conformant as far as Linux supports these ... + */ +#define TARGET_SOL_SOCKET 0xffff + +#define TARGET_SO_DEBUG 0x0001 /* Record debugging information. */ +#define TARGET_SO_REUSEADDR 0x0004 /* Allow reuse of local addresses. = */ +#define TARGET_SO_KEEPALIVE 0x0008 /* Keep connections alive and send + SIGPIPE when they die. */ +#define TARGET_SO_DONTROUTE 0x0010 /* Don't do local routing. */ +#define TARGET_SO_BROADCAST 0x0020 /* Allow transmission of + broadcast messages. */ +#define TARGET_SO_LINGER 0x0080 /* Block on close of a reliable + * socket to transmit pending data. + */ +#define TARGET_SO_OOBINLINE 0x0100 /* Receive out-of-band data in-band. + */ +#if 0 +/* To add: Allow local address and port reuse. */ +#define TARGET_SO_REUSEPORT 0x0200 +#endif + +#define TARGET_SO_TYPE 0x1008 /* Compatible name for SO_STYLE. */ +#define TARGET_SO_STYLE SO_TYPE /* Synonym */ +#define TARGET_SO_ERROR 0x1007 /* get error status and clear */ +#define TARGET_SO_SNDBUF 0x1001 /* Send buffer size. */ +#define TARGET_SO_RCVBUF 0x1002 /* Receive buffer. */ +#define TARGET_SO_SNDLOWAT 0x1003 /* send low-water mark */ +#define TARGET_SO_RCVLOWAT 0x1004 /* receive low-water mark */ +#define TARGET_SO_SNDTIMEO 0x1005 /* send timeout */ +#define TARGET_SO_RCVTIMEO 0x1006 /* receive timeout */ +#define TARGET_SO_ACCEPTCONN 0x1009 + +/* linux-specific, might as well be the same as on i386 */ +#define TARGET_SO_NO_CHECK 11 +#define TARGET_SO_PRIORITY 12 +#define TARGET_SO_BSDCOMPAT 14 + +#define TARGET_SO_PASSCRED 17 +#define TARGET_SO_PEERCRED 18 + +/* 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 SCM_TIMESTAMP SO_TIMESTAMP + +#define TARGET_SO_PEERSEC 30 +#define TARGET_SO_SNDBUFFORCE 31 +#define TARGET_SO_RCVBUFFORCE 33 +#define TARGET_SO_PASSSEC 34 + +/** sock_type - Socket types + * + * Please notice that for binary compat reasons MIPS has to + * override the enum sock_type in include/linux/net.h, so + * we define ARCH_HAS_SOCKET_TYPES here. + * + * @SOCK_DGRAM - datagram (conn.less) socket + * @SOCK_STREAM - stream (connection) socket + * @SOCK_RAW - raw socket + * @SOCK_RDM - reliably-delivered message + * @SOCK_SEQPACKET - sequential packet socket + * @SOCK_DCCP - Datagram Congestion Control Protocol socket + * @SOCK_PACKET - linux specific way of getting packets at the dev level. + * For writing rarp and other similar things on the user + * level. + * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. + * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. + */ + +#define ARCH_HAS_SOCKET_TYPES 1 + +enum sock_type { + TARGET_SOCK_DGRAM =3D 1, + TARGET_SOCK_STREAM =3D 2, + TARGET_SOCK_RAW =3D 3, + TARGET_SOCK_RDM =3D 4, + TARGET_SOCK_SEQPACKET =3D 5, + TARGET_SOCK_DCCP =3D 6, + TARGET_SOCK_PACKET =3D 10, + TARGET_SOCK_CLOEXEC =3D 02000000, + TARGET_SOCK_NONBLOCK =3D 0200, +}; + +#define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) +#define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-1. */ +#endif diff --git a/linux-user/mips64/sockbits.h b/linux-user/mips64/sockbits.h new file mode 100644 index 0000000000..e6b6d31ac9 --- /dev/null +++ b/linux-user/mips64/sockbits.h @@ -0,0 +1 @@ +#include "../mips/sockbits.h" diff --git a/linux-user/socket.h b/linux-user/socket.h index 7051cd2cf4..9c57da7a61 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -1,106 +1,6 @@ =20 -#if defined(TARGET_MIPS) - /* MIPS special values for constants */ - - /* - * For setsockopt(2) - * - * This defines are ABI conformant as far as Linux supports these ... - */ - #define TARGET_SOL_SOCKET 0xffff - - #define TARGET_SO_DEBUG 0x0001 /* Record debugging information= . */ - #define TARGET_SO_REUSEADDR 0x0004 /* Allow reuse of local address= es. */ - #define TARGET_SO_KEEPALIVE 0x0008 /* Keep connections alive and s= end - SIGPIPE when they die. */ - #define TARGET_SO_DONTROUTE 0x0010 /* Don't do local routing. */ - #define TARGET_SO_BROADCAST 0x0020 /* Allow transmission of - broadcast messages. */ - #define TARGET_SO_LINGER 0x0080 /* Block on close of a reliable - * socket to transmit pending d= ata. - */ - #define TARGET_SO_OOBINLINE 0x0100 /* Receive out-of-band data in-= band. - */ - #if 0 - /* To add: Allow local address and port reuse. */ - #define TARGET_SO_REUSEPORT 0x0200 - #endif - - #define TARGET_SO_TYPE 0x1008 /* Compatible name for SO_STYLE= . */ - #define TARGET_SO_STYLE SO_TYPE /* Synonym */ - #define TARGET_SO_ERROR 0x1007 /* get error status and clear */ - #define TARGET_SO_SNDBUF 0x1001 /* Send buffer size. */ - #define TARGET_SO_RCVBUF 0x1002 /* Receive buffer. */ - #define TARGET_SO_SNDLOWAT 0x1003 /* send low-water mark */ - #define TARGET_SO_RCVLOWAT 0x1004 /* receive low-water mark */ - #define TARGET_SO_SNDTIMEO 0x1005 /* send timeout */ - #define TARGET_SO_RCVTIMEO 0x1006 /* receive timeout */ - #define TARGET_SO_ACCEPTCONN 0x1009 - - /* linux-specific, might as well be the same as on i386 */ - #define TARGET_SO_NO_CHECK 11 - #define TARGET_SO_PRIORITY 12 - #define TARGET_SO_BSDCOMPAT 14 - - #define TARGET_SO_PASSCRED 17 - #define TARGET_SO_PEERCRED 18 - - /* 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 SCM_TIMESTAMP SO_TIMESTAMP - - #define TARGET_SO_PEERSEC 30 - #define TARGET_SO_SNDBUFFORCE 31 - #define TARGET_SO_RCVBUFFORCE 33 - #define TARGET_SO_PASSSEC 34 - - /** sock_type - Socket types - * - * Please notice that for binary compat reasons MIPS has to - * override the enum sock_type in include/linux/net.h, so - * we define ARCH_HAS_SOCKET_TYPES here. - * - * @SOCK_DGRAM - datagram (conn.less) socket - * @SOCK_STREAM - stream (connection) socket - * @SOCK_RAW - raw socket - * @SOCK_RDM - reliably-delivered message - * @SOCK_SEQPACKET - sequential packet socket - * @SOCK_DCCP - Datagram Congestion Control Protocol socket - * @SOCK_PACKET - linux specific way of getting packets at the dev lev= el. - * For writing rarp and other similar things on the user - * level. - * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. - * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. - */ - - #define ARCH_HAS_SOCKET_TYPES 1 - - enum sock_type { - TARGET_SOCK_DGRAM =3D 1, - TARGET_SOCK_STREAM =3D 2, - TARGET_SOCK_RAW =3D 3, - TARGET_SOCK_RDM =3D 4, - TARGET_SOCK_SEQPACKET =3D 5, - TARGET_SOCK_DCCP =3D 6, - TARGET_SOCK_PACKET =3D 10, - TARGET_SOCK_CLOEXEC =3D 02000000, - TARGET_SOCK_NONBLOCK =3D 0200, - }; - - #define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) - #define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-= 1. */ - +#if defined(TARGET_MIPS) || defined(TARGET_HPPA) +#include "sockbits.h" #elif defined(TARGET_ALPHA) =20 /* For setsockopt(2) */ @@ -205,8 +105,6 @@ =20 #define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) #define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-= 1. */ -#elif defined(TARGET_HPPA) -#include #else =20 #if defined(TARGET_SPARC) --=20 2.14.3 From nobody Thu Apr 25 06:49:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152650446971819.142914435391845; Wed, 16 May 2018 14:01:09 -0700 (PDT) Received: from localhost ([::1]:40191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3Xo-0003dP-Ru for importer@patchew.org; Wed, 16 May 2018 17:01:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3TP-0000Aa-Oa for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJ3TM-00040T-M5 for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:35 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:36893) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJ3TM-0003z6-Bz for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:32 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M3C4d-1eRuuZ3Xcd-00sssP; Wed, 16 May 2018 22:55:57 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 16 May 2018 22:55:37 +0200 Message-Id: <20180516205543.29305-3-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> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:k8Yr9k4Xw/HiIgsF1qibEnhqGe6wtQi3vU2fYyiI2LNug2gJAE3 jNJnKzfT5aGDw5G1nr6BX5S4sKPdOp/LQfBXqXmlixrjQe1JrI1noB2htvxdw0OG0Bj9eSt ggQ0xRoe9UccC2iXIJeC5N7+IqQKQz5rmeCiXkgEExKzv9kXPEA0h4N2R7iyQSj9z+mtLHX 8JAOZBp7nfk68aA+kStiA== X-UI-Out-Filterresults: notjunk:1;V01:K0:qQs8b3OszI8=:mFKrvIkLGUvFCPhCviU5Vl wK48nwNfC8zkgjhObq3fgsoxn3fb5W4NrhopAQvXlRGDR5+ItniHqvk4FrCnOTl4tWRpI2ag1 L7lOnm9EqIbc4WJcBTTM2KLjni1JgWTNqgFJmv3VZ/tCzPKxwwqj7eVh65pHV10Whseax7Y3V RnSQNMSrQ2Tw4Sr+SgStXCALnV+pagJvUTwO7GCN2+5BNoePWM0ruTEhFE+WlhtkNEOYYX8so 9KHFEQlFhBB791X9h6GQrZ4b7HBRTd7EFDpL8VRbT71HTrxL97iU/eL2fTUT2sXmwlgrHKuLg O8+mIb2tqNks5DFIQDKMIPZygMKsam6CggzEqsjxXUsOGh8zaSU71Sr4B1ivVG9wVAyDvX5ZP 6TY+R4Qeudmb1AyUUqqVD/ZhUnX58GWSNA1SZYEkxKOihwIjTUeeVfQ3tIJCU/q1gpvtRdjnV y3WpKczqysr87z7sdtLYDd55/8dY+DRhl3T+couqdfrR0bANan0Pft2h2nyuyo3wcKAqHICZ1 AUysxV6VEuRghr/BOPdMsXzt5AvZMYZAmcItjE0b/X43NpaT/PsUodyaYKJVsTN0AozJwRRMy KE2irYRXqO1owBmmsOJLUKTZMWSZCol6/iDQmQrT/l2ngopmlbes/GK1Q+E62/5bwnHCBNaJ+ n6TA8lkkcx/4kZeBPd6N3UbuODUADUJi/MpeLxQbUJZWMtUpfq9FL2dBpx8tCkR3k7h17dlFG ZMOCcau31zrK0V2y X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PATCH v2 2/8] linux-user: move alpha socket.h definitions to alpha/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: Peter Maydell , Riku Voipio , Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 No code change. Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/alpha/sockbits.h | 113 ++++++++++++++++++++++++++++++++++++++++= ++++ linux-user/socket.h | 106 +---------------------------------------- 2 files changed, 114 insertions(+), 105 deletions(-) create mode 100644 linux-user/alpha/sockbits.h diff --git a/linux-user/alpha/sockbits.h b/linux-user/alpha/sockbits.h new file mode 100644 index 0000000000..4db3e52b67 --- /dev/null +++ b/linux-user/alpha/sockbits.h @@ -0,0 +1,113 @@ +/* + * 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 ALPHA_SOCKBITS_H +#define ALPHA_SOCKBITS_H + +/* For setsockopt(2) */ +#define TARGET_SOL_SOCKET 0xffff + +#define TARGET_SO_DEBUG 0x0001 +#define TARGET_SO_REUSEADDR 0x0004 +#define TARGET_SO_KEEPALIVE 0x0008 +#define TARGET_SO_DONTROUTE 0x0010 +#define TARGET_SO_BROADCAST 0x0020 +#define TARGET_SO_LINGER 0x0080 +#define TARGET_SO_OOBINLINE 0x0100 +/* To add :#define TARGET_SO_REUSEPORT 0x0200 */ + +#define TARGET_SO_TYPE 0x1008 +#define TARGET_SO_ERROR 0x1007 +#define TARGET_SO_SNDBUF 0x1001 +#define TARGET_SO_RCVBUF 0x1002 +#define TARGET_SO_SNDBUFFORCE 0x100a +#define TARGET_SO_RCVBUFFORCE 0x100b +#define TARGET_SO_RCVLOWAT 0x1010 +#define TARGET_SO_SNDLOWAT 0x1011 +#define TARGET_SO_RCVTIMEO 0x1012 +#define TARGET_SO_SNDTIMEO 0x1013 +#define TARGET_SO_ACCEPTCONN 0x1014 +#define TARGET_SO_PROTOCOL 0x1028 +#define TARGET_SO_DOMAIN 0x1029 + +/* linux-specific, might as well be the same as on i386 */ +#define TARGET_SO_NO_CHECK 11 +#define TARGET_SO_PRIORITY 12 +#define TARGET_SO_BSDCOMPAT 14 + +#define TARGET_SO_PASSCRED 17 +#define TARGET_SO_PEERCRED 18 +#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_PEERSEC 30 +#define TARGET_SO_PASSSEC 34 +#define TARGET_SO_TIMESTAMPNS 35 +#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS + +/* Security levels - as per NRL IPv6 - don't actually do anything */ +#define TARGET_SO_SECURITY_AUTHENTICATION 19 +#define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 20 +#define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 21 + +#define TARGET_SO_MARK 36 + +#define TARGET_SO_TIMESTAMPING 37 +#define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING + +#define TARGET_SO_RXQ_OVFL 40 + +#define TARGET_SO_WIFI_STATUS 41 +#define TARGET_SCM_WIFI_STATUS TARGET_SO_WIFI_STATUS +#define TARGET_SO_PEEK_OFF 42 + +/* Instruct lower device to use last 4-bytes of skb data as FCS */ +#define TARGET_SO_NOFCS 43 + +/** sock_type - Socket types + * + * Please notice that for binary compat reasons ALPHA has to + * override the enum sock_type in include/linux/net.h, so + * we define ARCH_HAS_SOCKET_TYPES here. + * + * @SOCK_DGRAM - datagram (conn.less) socket + * @SOCK_STREAM - stream (connection) socket + * @SOCK_RAW - raw socket + * @SOCK_RDM - reliably-delivered message + * @SOCK_SEQPACKET - sequential packet socket + * @SOCK_DCCP - Datagram Congestion Control Protocol socket + * @SOCK_PACKET - linux specific way of getting packets at the dev level. + * For writing rarp and other similar things on the user + * level. + * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. + * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. + */ + +#define ARCH_HAS_SOCKET_TYPES 1 + +enum sock_type { + TARGET_SOCK_STREAM =3D 1, + TARGET_SOCK_DGRAM =3D 2, + TARGET_SOCK_RAW =3D 3, + TARGET_SOCK_RDM =3D 4, + TARGET_SOCK_SEQPACKET =3D 5, + TARGET_SOCK_DCCP =3D 6, + TARGET_SOCK_PACKET =3D 10, + TARGET_SOCK_CLOEXEC =3D 010000000, + TARGET_SOCK_NONBLOCK =3D 010000000000, +}; + +#define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) +#define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-1. */ +#endif diff --git a/linux-user/socket.h b/linux-user/socket.h index 9c57da7a61..1328906205 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -1,110 +1,6 @@ =20 -#if defined(TARGET_MIPS) || defined(TARGET_HPPA) +#if defined(TARGET_MIPS) || defined(TARGET_HPPA) || defined(TARGET_ALPHA) #include "sockbits.h" -#elif defined(TARGET_ALPHA) - - /* For setsockopt(2) */ - #define TARGET_SOL_SOCKET 0xffff - - #define TARGET_SO_DEBUG 0x0001 - #define TARGET_SO_REUSEADDR 0x0004 - #define TARGET_SO_KEEPALIVE 0x0008 - #define TARGET_SO_DONTROUTE 0x0010 - #define TARGET_SO_BROADCAST 0x0020 - #define TARGET_SO_LINGER 0x0080 - #define TARGET_SO_OOBINLINE 0x0100 - /* To add :#define TARGET_SO_REUSEPORT 0x0200 */ - - #define TARGET_SO_TYPE 0x1008 - #define TARGET_SO_ERROR 0x1007 - #define TARGET_SO_SNDBUF 0x1001 - #define TARGET_SO_RCVBUF 0x1002 - #define TARGET_SO_SNDBUFFORCE 0x100a - #define TARGET_SO_RCVBUFFORCE 0x100b - #define TARGET_SO_RCVLOWAT 0x1010 - #define TARGET_SO_SNDLOWAT 0x1011 - #define TARGET_SO_RCVTIMEO 0x1012 - #define TARGET_SO_SNDTIMEO 0x1013 - #define TARGET_SO_ACCEPTCONN 0x1014 - #define TARGET_SO_PROTOCOL 0x1028 - #define TARGET_SO_DOMAIN 0x1029 - - /* linux-specific, might as well be the same as on i386 */ - #define TARGET_SO_NO_CHECK 11 - #define TARGET_SO_PRIORITY 12 - #define TARGET_SO_BSDCOMPAT 14 - - #define TARGET_SO_PASSCRED 17 - #define TARGET_SO_PEERCRED 18 - #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_PEERSEC 30 - #define TARGET_SO_PASSSEC 34 - #define TARGET_SO_TIMESTAMPNS 35 - #define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS - - /* Security levels - as per NRL IPv6 - don't actually do anything */ - #define TARGET_SO_SECURITY_AUTHENTICATION 19 - #define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 20 - #define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 21 - - #define TARGET_SO_MARK 36 - - #define TARGET_SO_TIMESTAMPING 37 - #define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING - - #define TARGET_SO_RXQ_OVFL 40 - - #define TARGET_SO_WIFI_STATUS 41 - #define TARGET_SCM_WIFI_STATUS TARGET_SO_WIFI_STATUS - #define TARGET_SO_PEEK_OFF 42 - - /* Instruct lower device to use last 4-bytes of skb data as FCS */ - #define TARGET_SO_NOFCS 43 - - /** sock_type - Socket types - * - * Please notice that for binary compat reasons ALPHA has to - * override the enum sock_type in include/linux/net.h, so - * we define ARCH_HAS_SOCKET_TYPES here. - * - * @SOCK_DGRAM - datagram (conn.less) socket - * @SOCK_STREAM - stream (connection) socket - * @SOCK_RAW - raw socket - * @SOCK_RDM - reliably-delivered message - * @SOCK_SEQPACKET - sequential packet socket - * @SOCK_DCCP - Datagram Congestion Control Protocol socket - * @SOCK_PACKET - linux specific way of getting packets at the dev lev= el. - * For writing rarp and other similar things on the user - * level. - * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. - * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. - */ - - #define ARCH_HAS_SOCKET_TYPES 1 - - enum sock_type { - TARGET_SOCK_STREAM =3D 1, - TARGET_SOCK_DGRAM =3D 2, - TARGET_SOCK_RAW =3D 3, - TARGET_SOCK_RDM =3D 4, - TARGET_SOCK_SEQPACKET =3D 5, - TARGET_SOCK_DCCP =3D 6, - TARGET_SOCK_PACKET =3D 10, - TARGET_SOCK_CLOEXEC =3D 010000000, - TARGET_SOCK_NONBLOCK =3D 010000000000, - }; - - #define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) - #define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-= 1. */ #else =20 #if defined(TARGET_SPARC) --=20 2.14.3 From nobody Thu Apr 25 06:49:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526504514250452.05984700347767; Wed, 16 May 2018 14:01:54 -0700 (PDT) Received: from localhost ([::1]:40214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3YX-0004A8-Ap for importer@patchew.org; Wed, 16 May 2018 17:01:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3TT-0000E7-PE for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJ3TQ-00044k-NW for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:39 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:54593) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJ3TQ-00042r-D6 for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:36 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MNL1F-1fChnj2CrZ-006wv5; Wed, 16 May 2018 22:55:58 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 16 May 2018 22:55:38 +0200 Message-Id: <20180516205543.29305-4-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> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:1llCLVFTv/gBsZhkO/xaO+gWofqFz93Uv7zOinL54YkIlhZx6pc +1GbtcZ993ZoHKyucggsZ1+d82YqswjUYcKXgGJJ87p7DY3EO3nxKJ3RvoYtm9+3nIEeP4U Ad85L4IZ2zMUUH9c6M+owTp4KlUlAbnqhEx7ntJt4v0ItSTiVhLlxZXZ9D53aJ82V7TlUcQ V/gLkNDFDty+YWoXTsuPw== X-UI-Out-Filterresults: notjunk:1;V01:K0:X+W7894bhOo=:+5DvymV6uRxFi7N65tPU/K BM1nTDPsS1j3lrc3bl87HqVohff2vDnZudyqpxsxQWehZ3f9h68K3HYXIFSOZ8cTJA1A9T/+O Ycm0jd01aZiOeUGxQcVglxPvnP3HAejO3ySllUxIKP1PmRndIwj5IwwL+W2vymAdvwJ/WXTCy ZeFcjSswI0KgHSs8OBVAG80EzORzaGFPNIaCZg6JmkUvOoSwKStSHftyRVV/Lc80EWM6TTwRM fgirXK1f9fZVEWMOk3ItqywWmQGRcVu8ohk/CwnvtlsNk2T0kayRvVjVX6t79TCnVNjAg0auf Uk21GypPxz2WYxlcMgxqDAOndLWonIAnwdsyLwKZOKfiyi+cjq/bJY+H3jDr/W280DDwyEWWm WRHfZogLqZH0pEPR+4S2sGgwYGmTBNj2902U2cd6ltnsyyYH1nSuJ+nDq+vLdU1GRZTS1zww4 iW5ZREOWr8b8TWUMfGFUl3IY8HvEmcIx5Cpw3RXUCgalKtcXwXqeVoQhboqjfyDZXtWSDvO2c k2v2pfE2ikO6UAP6zQR/qb7z+mKrKCh3KY8peklFW5BlUPzmIg/eaF+0z4Jg13NpQ2WO9b9kj 44LshB1XoBRXA3b+JjXh0V/zaZ3SRLiTeNyOGJ/fTeHLGgklhEsc+xwRUbk9RHHFZY9SPiVcn IstADFB8rr+AnDvXg6cgjhOsOcGk2ApMG/uDJclgcNwuUeIymeNktGcxM40sHMuPg/nXwaK52 E6xFyCtY9/plLWwD 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 3/8] linux-user: move sparc/sparc64 socket.h definitions to sparc/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: Peter Maydell , Riku Voipio , Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 No code change. Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/socket.h | 44 +------------------- linux-user/sparc/sockbits.h | 94 +++++++++++++++++++++++++++++++++++++++= ++++ linux-user/sparc64/sockbits.h | 1 + 3 files changed, 97 insertions(+), 42 deletions(-) create mode 100644 linux-user/sparc/sockbits.h create mode 100644 linux-user/sparc64/sockbits.h diff --git a/linux-user/socket.h b/linux-user/socket.h index 1328906205..8eb62ea3f2 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -1,49 +1,9 @@ =20 -#if defined(TARGET_MIPS) || defined(TARGET_HPPA) || defined(TARGET_ALPHA) +#if defined(TARGET_MIPS) || defined(TARGET_HPPA) || defined(TARGET_ALPHA) = || \ + defined(TARGET_SPARC) #include "sockbits.h" -#else - -#if defined(TARGET_SPARC) - /** sock_type - Socket types - * - * Please notice that for binary compat reasons SPARC has to - * override the enum sock_type in include/linux/net.h, so - * we define ARCH_HAS_SOCKET_TYPES here. - * - * @SOCK_DGRAM - datagram (conn.less) socket - * @SOCK_STREAM - stream (connection) socket - * @SOCK_RAW - raw socket - * @SOCK_RDM - reliably-delivered message - * @SOCK_SEQPACKET - sequential packet socket - * @SOCK_DCCP - Datagram Congestion Control Protocol socket - * @SOCK_PACKET - linux specific way of getting packets at the dev lev= el. - * For writing rarp and other similar things on the user - * level. - * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. - * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. - */ - - #define ARCH_HAS_SOCKET_TYPES 1 - - enum sock_type { - TARGET_SOCK_STREAM =3D 1, - TARGET_SOCK_DGRAM =3D 2, - TARGET_SOCK_RAW =3D 3, - TARGET_SOCK_RDM =3D 4, - TARGET_SOCK_SEQPACKET =3D 5, - TARGET_SOCK_DCCP =3D 6, - TARGET_SOCK_PACKET =3D 10, - TARGET_SOCK_CLOEXEC =3D 020000000, - TARGET_SOCK_NONBLOCK =3D 040000, - }; - - #define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) - #define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-= 1. */ - - #define TARGET_SO_PASSSEC 31 #else #define TARGET_SO_PASSSEC 34 -#endif =20 /* For setsockopt(2) */ #define TARGET_SOL_SOCKET 1 diff --git a/linux-user/sparc/sockbits.h b/linux-user/sparc/sockbits.h new file mode 100644 index 0000000000..385061c8b0 --- /dev/null +++ b/linux-user/sparc/sockbits.h @@ -0,0 +1,94 @@ +/* + * 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 SPARC_SOCKBITS_H +#define SPARC_SOCKBITS_H + +/** sock_type - Socket types + * + * Please notice that for binary compat reasons SPARC has to + * override the enum sock_type in include/linux/net.h, so + * we define ARCH_HAS_SOCKET_TYPES here. + * + * @SOCK_DGRAM - datagram (conn.less) socket + * @SOCK_STREAM - stream (connection) socket + * @SOCK_RAW - raw socket + * @SOCK_RDM - reliably-delivered message + * @SOCK_SEQPACKET - sequential packet socket + * @SOCK_DCCP - Datagram Congestion Control Protocol socket + * @SOCK_PACKET - linux specific way of getting packets at the dev level. + * For writing rarp and other similar things on the user + * level. + * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. + * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. + */ + +#define ARCH_HAS_SOCKET_TYPES 1 + +enum sock_type { + TARGET_SOCK_STREAM =3D 1, + TARGET_SOCK_DGRAM =3D 2, + TARGET_SOCK_RAW =3D 3, + TARGET_SOCK_RDM =3D 4, + TARGET_SOCK_SEQPACKET =3D 5, + TARGET_SOCK_DCCP =3D 6, + TARGET_SOCK_PACKET =3D 10, + TARGET_SOCK_CLOEXEC =3D 020000000, + TARGET_SOCK_NONBLOCK =3D 040000, +}; + +#define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) +#define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-1. */ + +#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 + +/* 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/sparc64/sockbits.h b/linux-user/sparc64/sockbits.h new file mode 100644 index 0000000000..658899e4d3 --- /dev/null +++ b/linux-user/sparc64/sockbits.h @@ -0,0 +1 @@ +#include "../sparc/sockbits.h" --=20 2.14.3 From nobody Thu Apr 25 06:49:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526504762606432.1980668785761; Wed, 16 May 2018 14:06:02 -0700 (PDT) Received: from localhost ([::1]:40417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3cO-0007EG-IN for importer@patchew.org; Wed, 16 May 2018 17:05:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3TU-0000FF-Py for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJ3TR-00045n-Mt for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:40 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:57635) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJ3TR-00044a-DC for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:37 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MT8yM-1esDAs1C58-00S6qa; Wed, 16 May 2018 22:56:00 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 16 May 2018 22:55:39 +0200 Message-Id: <20180516205543.29305-5-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:2b38HXpOl9rS/70W4Jsg6QLvANdPUnATqnG6S9LrSkvq/BRiX6J YmKditTItHyHQVcHJR2213lab5U5MoVgIvtn0B7LIm2Jp44a4meuD/to9Vo/h/G7eM9urwb NawQSnLLb5YemDTV/LRxtQTXo2CKjZUtM4roxrysvZg+H32AGnWIy2LefiBkfxWFGJoZf3R YvM735XVbs/QjZReyDGJA== X-UI-Out-Filterresults: notjunk:1;V01:K0:cYTRDyQ7uLI=:bPJAruOoxhuAeG99W6EkRR K2E3QeQVIRvWSmzWlsI8JNOIQkMWIjpBG8HoyruvHJ5HTXfre19YkZ+yENFnlZ2XzIgdKGi7V mIHBv5Exr9xs/8TJGoPdab7DEgZWlnF9qjExomoSza2Bs6jrP49elwrI7XAJ8reUJ/Azf9Y91 yQ61bLkwYDkG9K82aaeP9xvMMc7kZmoTlD0pDHM+BmkeGkBiBhNL6U5t6YeCQRqhPoAfCcWYp R95HTzIMDwSVhoo7UJ8mAeupnANWt+GEiZ/37KsR1llcYomgFkETIYxA+Kul097QEKg1SzDbW pSUEcbif22vch0MAJLLGbkOkpinusjCOhYLsignS/oCFq2Rpk+QNCAGp+GIKtj7O2EDi4pgoN hl24llV5zIm6k5E8o9Kg6n/MPjJVP4qOEEhNr6KRQ6NxLc14l4uK3CqntGOTOtctgep3rX+Z3 10W1WmbE47uoheAeEhz67Vm6m3tfEpRiO04mgKsDnS1RKvAV7GJ5KG8+lE4rpR5Ahmciw9BVi 9zj5lVNJlo0qW9xYyyKK6f6ZFa5UrI1t61leudO0X39vwX0C18khn8w/xmRRL9vxkQXoYGq7F caUh0Sn/c6VfsAWeOf2VF8RE0P25pbVoP3iyQkA95nfqs3HF8gMejGB3fbsXyUw9a/UgA9xr9 RCXqzBO+WppHVdpYU51C9AQn6yWegcHBi0YrxH59Q7a2U6iANB6tZ++1hSR5ezta2blg= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PATCH v2 4/8] linux-user: move socket.h generic definitions to generic/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: Peter Maydell , Riku Voipio , Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" and include the file from architectures without specific definitions Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell --- linux-user/aarch64/sockbits.h | 1 + linux-user/arm/sockbits.h | 1 + linux-user/cris/sockbits.h | 1 + linux-user/generic/sockbits.h | 67 ++++++++++++++++++++++++++++++++++++= ++++ linux-user/i386/sockbits.h | 1 + linux-user/m68k/sockbits.h | 1 + linux-user/microblaze/sockbits.h | 1 + linux-user/nios2/sockbits.h | 1 + linux-user/openrisc/sockbits.h | 1 + linux-user/ppc/sockbits.h | 1 + linux-user/riscv/sockbits.h | 1 + linux-user/s390x/sockbits.h | 1 + linux-user/sh4/sockbits.h | 1 + linux-user/socket.h | 61 ------------------------------------ linux-user/tilegx/sockbits.h | 1 + linux-user/x86_64/sockbits.h | 1 + linux-user/xtensa/sockbits.h | 1 + 17 files changed, 82 insertions(+), 61 deletions(-) create mode 100644 linux-user/aarch64/sockbits.h create mode 100644 linux-user/arm/sockbits.h create mode 100644 linux-user/cris/sockbits.h create mode 100644 linux-user/generic/sockbits.h create mode 100644 linux-user/i386/sockbits.h create mode 100644 linux-user/m68k/sockbits.h create mode 100644 linux-user/microblaze/sockbits.h create mode 100644 linux-user/nios2/sockbits.h create mode 100644 linux-user/openrisc/sockbits.h create mode 100644 linux-user/ppc/sockbits.h create mode 100644 linux-user/riscv/sockbits.h create mode 100644 linux-user/s390x/sockbits.h create mode 100644 linux-user/sh4/sockbits.h create mode 100644 linux-user/tilegx/sockbits.h create mode 100644 linux-user/x86_64/sockbits.h create mode 100644 linux-user/xtensa/sockbits.h diff --git a/linux-user/aarch64/sockbits.h b/linux-user/aarch64/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/aarch64/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/arm/sockbits.h b/linux-user/arm/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/arm/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/cris/sockbits.h b/linux-user/cris/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/cris/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h new file mode 100644 index 0000000000..093faf0a48 --- /dev/null +++ b/linux-user/generic/sockbits.h @@ -0,0 +1,67 @@ +/* + * 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 GENERIC_SOCKBITS_H +#define GENERIC_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 */ +#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 +#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/i386/sockbits.h b/linux-user/i386/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/i386/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/m68k/sockbits.h b/linux-user/m68k/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/m68k/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/microblaze/sockbits.h b/linux-user/microblaze/sockb= its.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/microblaze/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/nios2/sockbits.h b/linux-user/nios2/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/nios2/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/openrisc/sockbits.h b/linux-user/openrisc/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/openrisc/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/ppc/sockbits.h b/linux-user/ppc/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/ppc/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/riscv/sockbits.h b/linux-user/riscv/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/riscv/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/s390x/sockbits.h b/linux-user/s390x/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/s390x/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/sh4/sockbits.h b/linux-user/sh4/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/sh4/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/socket.h b/linux-user/socket.h index 8eb62ea3f2..135f438bdf 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -1,66 +1,5 @@ =20 -#if defined(TARGET_MIPS) || defined(TARGET_HPPA) || defined(TARGET_ALPHA) = || \ - defined(TARGET_SPARC) #include "sockbits.h" -#else - #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 */ -#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 - #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 =20 #ifndef ARCH_HAS_SOCKET_TYPES /** sock_type - Socket types - default values diff --git a/linux-user/tilegx/sockbits.h b/linux-user/tilegx/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/tilegx/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/x86_64/sockbits.h b/linux-user/x86_64/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/x86_64/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" diff --git a/linux-user/xtensa/sockbits.h b/linux-user/xtensa/sockbits.h new file mode 100644 index 0000000000..0e4c8f012d --- /dev/null +++ b/linux-user/xtensa/sockbits.h @@ -0,0 +1 @@ +#include "../generic/sockbits.h" --=20 2.14.3 From nobody Thu Apr 25 06:49:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526504546917714.7309130918233; Wed, 16 May 2018 14:02:26 -0700 (PDT) Received: from localhost ([::1]:40225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3Z4-0004ZV-7C for importer@patchew.org; Wed, 16 May 2018 17:02:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3TP-0000AY-MT for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJ3TM-00040O-Lm for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:35 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:32933) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJ3TM-0003zF-Ci for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:32 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Mf0OX-1evAvj0QnJ-00OTnv; Wed, 16 May 2018 22:56:02 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 16 May 2018 22:55:40 +0200 Message-Id: <20180516205543.29305-6-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:n6yY7AfqvOSaIEITaeHHXlR9lzCT07Ml7z6mjrT/FYUvgrL8ja+ wc89oDsy0xf+G3pEW2UQHf5YUQXeVhAtlsflK9jZi9m0TS84DfAjEJ6Nj0x4T89hloIR12k ycpaelcIGNvUluTPfJAOqQDrd9mRQrCl6jg6qXR/yLc1XpNMizZ9/lNPjEva0qtP3KCmW/C lTwuFChw59r3YmBIWg+tQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:ynb3wwWu7g0=:vT994GNyjI1zY8xbH0WZXv oJEHOjWfzLscqRIQ+w3KBo/ZXkSBxaPvQMVXJO8ANKUclhLkEE6sfq44G/x63iipN2glR3Yy6 6PWGUX64Nf8hTEbWC+1cey8/62aETp4XItpMpf2PnriLtrihbPjUQ/Lea1h3s8KqsaZ6l6XCN EpekoGJG/IFE2CdClCk+7tqSWmF+oD9NeQEpkt/nIaSX2GUyjpJcstRgQPrOkVXjH1pKWR2jf MJDh1kvUJYUO+xz9MfGFl5p1/OXCzG7ne45DapQ1Tn8EpLaQJbFggSzfQC/FVen2Xy5p4lz/4 myIKqgyvjoYBEx6k6PYFncEP/EKkfszwb7aniIoSMHN2oiS1N7oGnK7Py5UKgv/sg/Lox4c8G VXxjwAf++DpaSsbHI/KMsStBmT1sdQzShNljdJCS4ZFJb6QyrVDnjuw7jMs26IAcV9FPWdGy1 2uWwRQEmcryLWGnLjJDSSKKLTUAcNi26lcTuDI+V+oQfTWlBZefisO2l/y4E34vV98vf7TGjC 4KxerugQ5rYoZ3GTq2lK3gJ2oiITIEhZ67rhqmv49MkEV29E2gjblKTTloFd3lc00MOtlraOF 4I6u9s1Wlsf1Tk1D1DpClypy5V1+Bys61UcaY5qvbnUMSrM1EqQvx4XmfMhmpsh//Tyb5i68V SKl4nMx/kjqlo5688aW0uicrKYxL4lagaaXiAcctT310dzMyarApJyYeCKd/UNz+DqSc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PATCH v2 5/8] 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: Peter Maydell , Riku Voipio , Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" No code change. Signed-off-by: Laurent Vivier --- linux-user/generic/sockbits.h | 9 +-------- linux-user/ppc/sockbits.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h index 093faf0a48..5ad43eb0c8 100644 --- a/linux-user/generic/sockbits.h +++ b/linux-user/generic/sockbits.h @@ -30,14 +30,7 @@ #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 +#ifndef TARGET_SO_PASSCRED /* powerpc only differs in these */ #define TARGET_SO_PASSCRED 16 #define TARGET_SO_PEERCRED 17 #define TARGET_SO_RCVLOWAT 18 diff --git a/linux-user/ppc/sockbits.h b/linux-user/ppc/sockbits.h index 0e4c8f012d..3593bc44ac 100644 --- a/linux-user/ppc/sockbits.h +++ b/linux-user/ppc/sockbits.h @@ -1 +1,20 @@ +/* + * 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_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 + #include "../generic/sockbits.h" + +#endif --=20 2.14.3 From nobody Thu Apr 25 06:49:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526504640377935.6355640813097; Wed, 16 May 2018 14:04:00 -0700 (PDT) Received: from localhost ([::1]:40268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3aZ-0005es-Gy for importer@patchew.org; Wed, 16 May 2018 17:03:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3TZ-0000Jv-E6 for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJ3TW-00047w-AD for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:45 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:48089) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJ3TV-00047Z-W0 for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:42 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MA5UH-1f8MDS2HrV-00BOuZ; Wed, 16 May 2018 22:56:04 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 16 May 2018 22:55:41 +0200 Message-Id: <20180516205543.29305-7-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:fygvOULWAatTRvkeplap5VpWdOamay44dtevlSmlZNEnGbrkEWv dforizEd3WPIDohCIScS4cNRpeVtZ/WZz+srbM+wned2lm39GZ8YatsYdmAFF8/Hodo/f+s Z+7uZsdvwMMdSQSzigf1t2pifPhz383Wm1aV72SNawjXbgyBFkdDtuEM4FGJrfDatGez4bn /0WrroyEOIYMsuHLCh/MQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:FewpPD8MMTg=:COlgHwpxlXCFfp2g9tryLS 70VEid+44soC3LVze69DXhYtCjV/1bZwsEBpaQBpePML37yYHU/u0TUnoIO867kvQHvE9rbhq 9AUhJG+xM4bNLclGo7fYdhhfpKHIrxOyFfBXWkbOH7NX5vOq1UgEPdDUSM0YzxOCMf9kbvzCx Tt02EcJ7fR7LCFKBmk42vXDjxRR5t13fNHpfWpP8FsQfYnNaZ0dqFx5D9zDcXaWw4gA+Akb0I UUXfbplDaxkLY9BV7r3GMUJJGEmVJyDR3pIXLRFWWpGaXvSa5hC/7ZUBc7Lh9AtYea/1YnU0g s8mD+con9JEKyQUUaAv5mnLLP39q3OiR3XV/iC8eDvx3XDtEEofKN3i+Nj6g77ndEbMU4zzAN 3rm4JWqAdMhaas6za5cpZ7/n5eQFLuZ+/Mb+YqTYjk5TUbJqnbszIxkvWUmlgtgMST6511aCM j55KDR5qyk8tnG66x5rLJTcEzaAZJpB+wM5TlI/rH96fHgc3pXiuCOAowWRunAGt+o3NjwgHH TvSnJQsOsiPAEC9NvT9O69p3FBd4d5xJKgNwN6WdsCCmmUT1W6TYKnJtCSk+WmiPk9TL+iYNV 1zkW1NeCUeyZZOV6+5wbuUmbWv+8BepUm69obb6URx761LLDW/z4IwR12TGQf8/s5BhhoXbyf OEceQ26tf88dvaXPuishg1Jpt3OZ2PwKTdAWXmcrmBHP1ZKAERAF5L3NNpOOqqhIvbVg= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PATCH v2 6/8] linux-user: update ARCH_HAS_SOCKET_TYPES use 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=20Mathieu-Daud=C3=A9?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" to be like in the kernel and rename it TARGET_ARCH_HAS_SOCKET_TYPES Signed-off-by: Laurent Vivier --- linux-user/alpha/sockbits.h | 36 +++----------------------- linux-user/hppa/sockbits.h | 33 +++--------------------- linux-user/mips/sockbits.h | 9 ++++--- linux-user/socket.h | 62 +++++++++++++++++++++++------------------= ---- linux-user/sparc/sockbits.h | 36 -------------------------- 5 files changed, 44 insertions(+), 132 deletions(-) diff --git a/linux-user/alpha/sockbits.h b/linux-user/alpha/sockbits.h index 4db3e52b67..f5397dd875 100644 --- a/linux-user/alpha/sockbits.h +++ b/linux-user/alpha/sockbits.h @@ -75,39 +75,9 @@ /* Instruct lower device to use last 4-bytes of skb data as FCS */ #define TARGET_SO_NOFCS 43 =20 -/** sock_type - Socket types - * - * Please notice that for binary compat reasons ALPHA has to - * override the enum sock_type in include/linux/net.h, so - * we define ARCH_HAS_SOCKET_TYPES here. - * - * @SOCK_DGRAM - datagram (conn.less) socket - * @SOCK_STREAM - stream (connection) socket - * @SOCK_RAW - raw socket - * @SOCK_RDM - reliably-delivered message - * @SOCK_SEQPACKET - sequential packet socket - * @SOCK_DCCP - Datagram Congestion Control Protocol socket - * @SOCK_PACKET - linux specific way of getting packets at the dev level. - * For writing rarp and other similar things on the user - * level. - * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. - * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. +/* TARGET_O_NONBLOCK clashes with the bits used for socket types. Therefo= re we + * have to define SOCK_NONBLOCK to a different value here. */ +#define TARGET_SOCK_NONBLOCK 0x40000000 =20 -#define ARCH_HAS_SOCKET_TYPES 1 - -enum sock_type { - TARGET_SOCK_STREAM =3D 1, - TARGET_SOCK_DGRAM =3D 2, - TARGET_SOCK_RAW =3D 3, - TARGET_SOCK_RDM =3D 4, - TARGET_SOCK_SEQPACKET =3D 5, - TARGET_SOCK_DCCP =3D 6, - TARGET_SOCK_PACKET =3D 10, - TARGET_SOCK_CLOEXEC =3D 010000000, - TARGET_SOCK_NONBLOCK =3D 010000000000, -}; - -#define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) -#define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-1. */ #endif diff --git a/linux-user/hppa/sockbits.h b/linux-user/hppa/sockbits.h index 5044619e16..2641aea859 100644 --- a/linux-user/hppa/sockbits.h +++ b/linux-user/hppa/sockbits.h @@ -64,34 +64,7 @@ =20 #define TARGET_SO_CNX_ADVICE 0x402E =20 -/** sock_type - Socket types - default values - * - * - * @SOCK_STREAM - stream (connection) socket - * @SOCK_DGRAM - datagram (conn.less) socket - * @SOCK_RAW - raw socket - * @SOCK_RDM - reliably-delivered message - * @SOCK_SEQPACKET - sequential packet socket - * @SOCK_DCCP - Datagram Congestion Control Protocol socket - * @SOCK_PACKET - linux specific way of getting packets at the dev level. - * For writing rarp and other similar things on the user - * level. - * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. - * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. +/* TARGET_O_NONBLOCK clashes with the bits used for socket types. Therefo= re we + * have to define SOCK_NONBLOCK to a different value here. */ -enum sock_type { - TARGET_SOCK_STREAM =3D 1, - TARGET_SOCK_DGRAM =3D 2, - TARGET_SOCK_RAW =3D 3, - TARGET_SOCK_RDM =3D 4, - TARGET_SOCK_SEQPACKET =3D 5, - TARGET_SOCK_DCCP =3D 6, - TARGET_SOCK_PACKET =3D 10, - TARGET_SOCK_CLOEXEC =3D 010000000, - TARGET_SOCK_NONBLOCK =3D 0x40000000, -}; - -#define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) -#define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-1. */ - -#define ARCH_HAS_SOCKET_TYPES 1 +#define TARGET_SOCK_NONBLOCK 0x40000000 diff --git a/linux-user/mips/sockbits.h b/linux-user/mips/sockbits.h index 3fe5ac88e7..370d13ed86 100644 --- a/linux-user/mips/sockbits.h +++ b/linux-user/mips/sockbits.h @@ -91,7 +91,7 @@ * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. */ =20 -#define ARCH_HAS_SOCKET_TYPES 1 +#define TARGET_ARCH_HAS_SOCKET_TYPES 1 =20 enum sock_type { TARGET_SOCK_DGRAM =3D 1, @@ -101,10 +101,13 @@ enum sock_type { TARGET_SOCK_SEQPACKET =3D 5, TARGET_SOCK_DCCP =3D 6, TARGET_SOCK_PACKET =3D 10, - TARGET_SOCK_CLOEXEC =3D 02000000, - TARGET_SOCK_NONBLOCK =3D 0200, }; =20 #define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) #define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-1. */ + +/* Flags for socket, socketpair, paccept */ +#define TARGET_SOCK_CLOEXEC TARGET_O_CLOEXEC +#define TARGET_SOCK_NONBLOCK TARGET_O_NONBLOCK + #endif diff --git a/linux-user/socket.h b/linux-user/socket.h index 135f438bdf..8de8681015 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -1,35 +1,37 @@ - #include "sockbits.h" =20 -#ifndef ARCH_HAS_SOCKET_TYPES - /** sock_type - Socket types - default values - * - * - * @SOCK_STREAM - stream (connection) socket - * @SOCK_DGRAM - datagram (conn.less) socket - * @SOCK_RAW - raw socket - * @SOCK_RDM - reliably-delivered message - * @SOCK_SEQPACKET - sequential packet socket - * @SOCK_DCCP - Datagram Congestion Control Protocol socket - * @SOCK_PACKET - linux specific way of getting packets at the dev lev= el. - * For writing rarp and other similar things on the user - * level. - * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. - * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. - */ - enum sock_type { - TARGET_SOCK_STREAM =3D 1, - TARGET_SOCK_DGRAM =3D 2, - TARGET_SOCK_RAW =3D 3, - TARGET_SOCK_RDM =3D 4, - TARGET_SOCK_SEQPACKET =3D 5, - TARGET_SOCK_DCCP =3D 6, - TARGET_SOCK_PACKET =3D 10, - TARGET_SOCK_CLOEXEC =3D 02000000, - TARGET_SOCK_NONBLOCK =3D 04000, - }; +#ifndef TARGET_ARCH_HAS_SOCKET_TYPES +/** sock_type - Socket types - default values + * + * + * @SOCK_STREAM - stream (connection) socket + * @SOCK_DGRAM - datagram (conn.less) socket + * @SOCK_RAW - raw socket + * @SOCK_RDM - reliably-delivered message + * @SOCK_SEQPACKET - sequential packet socket + * @SOCK_DCCP - Datagram Congestion Control Protocol socket + * @SOCK_PACKET - linux specific way of getting packets at the dev level. + * For writing rarp and other similar things on the user + * level. + * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. + * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. + */ +enum sock_type { + TARGET_SOCK_STREAM =3D 1, + TARGET_SOCK_DGRAM =3D 2, + TARGET_SOCK_RAW =3D 3, + TARGET_SOCK_RDM =3D 4, + TARGET_SOCK_SEQPACKET =3D 5, + TARGET_SOCK_DCCP =3D 6, + TARGET_SOCK_PACKET =3D 10, +}; =20 - #define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) - #define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-= 1. */ +#define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) +#define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-1. */ =20 +/* Flags for socket, socketpair, accept4 */ +#define TARGET_SOCK_CLOEXEC TARGET_O_CLOEXEC +#ifndef TARGET_SOCK_NONBLOCK +#define TARGET_SOCK_NONBLOCK O_NONBLOCK #endif +#endif /* TARGET_ARCH_HAS_SOCKET_TYPES */ diff --git a/linux-user/sparc/sockbits.h b/linux-user/sparc/sockbits.h index 385061c8b0..6434b07033 100644 --- a/linux-user/sparc/sockbits.h +++ b/linux-user/sparc/sockbits.h @@ -8,42 +8,6 @@ #ifndef SPARC_SOCKBITS_H #define SPARC_SOCKBITS_H =20 -/** sock_type - Socket types - * - * Please notice that for binary compat reasons SPARC has to - * override the enum sock_type in include/linux/net.h, so - * we define ARCH_HAS_SOCKET_TYPES here. - * - * @SOCK_DGRAM - datagram (conn.less) socket - * @SOCK_STREAM - stream (connection) socket - * @SOCK_RAW - raw socket - * @SOCK_RDM - reliably-delivered message - * @SOCK_SEQPACKET - sequential packet socket - * @SOCK_DCCP - Datagram Congestion Control Protocol socket - * @SOCK_PACKET - linux specific way of getting packets at the dev level. - * For writing rarp and other similar things on the user - * level. - * @SOCK_CLOEXEC - sets the close-on-exec (FD_CLOEXEC) flag. - * @SOCK_NONBLOCK - sets the O_NONBLOCK file status flag. - */ - -#define ARCH_HAS_SOCKET_TYPES 1 - -enum sock_type { - TARGET_SOCK_STREAM =3D 1, - TARGET_SOCK_DGRAM =3D 2, - TARGET_SOCK_RAW =3D 3, - TARGET_SOCK_RDM =3D 4, - TARGET_SOCK_SEQPACKET =3D 5, - TARGET_SOCK_DCCP =3D 6, - TARGET_SOCK_PACKET =3D 10, - TARGET_SOCK_CLOEXEC =3D 020000000, - TARGET_SOCK_NONBLOCK =3D 040000, -}; - -#define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) -#define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-1. */ - #define TARGET_SO_PASSSEC 31 =20 /* For setsockopt(2) */ --=20 2.14.3 From nobody Thu Apr 25 06:49:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526504330380160.03586749905412; Wed, 16 May 2018 13:58:50 -0700 (PDT) Received: from localhost ([::1]:40129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3VZ-0001bI-DX for importer@patchew.org; Wed, 16 May 2018 16:58:49 -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=20Mathieu-Daud=C3=A9?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =20 -#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 =20 -/* 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 =20 -#define TARGET_SO_BINDTODEVICE 25 +#define TARGET_SO_BINDTODEVICE 0x000d =20 -/* 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 =20 -#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 =20 -#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 =20 -#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 --=20 2.14.3 From nobody Thu Apr 25 06:49:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526504782603847.402014688018; Wed, 16 May 2018 14:06:22 -0700 (PDT) Received: from localhost ([::1]:40426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3cl-0007SQ-7I for importer@patchew.org; Wed, 16 May 2018 17:06:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3Tc-0000MZ-Ms for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJ3TZ-00049T-Ku for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:48 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:43041) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJ3TZ-00048o-Cj for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:45 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M6DoA-1eM6xg1Zko-00y5XM; Wed, 16 May 2018 22:56:06 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 16 May 2018 22:55:43 +0200 Message-Id: <20180516205543.29305-9-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:UZfkokUaCasKqx3+GWUBKTbh4060cTNVH0wCpBjlj0nlKyYXxo1 Wq2vUFkGStVtM2mdbB9aTx3z4HBDwhKRNECXVKN8bg2g6s484VZ1jgPF4CHir2EXUrAb3sB wfi+vWxwozg6mDcKq5X/LDM/xf3VfCl5LxHI6FZLk8v1BOK/UlfoqCS6toouGynlXbGJQcr /XOOasGjIy22lFbWQp6Zw== X-UI-Out-Filterresults: notjunk:1;V01:K0:XJPFIA3or6s=:K871FxRYZjrUIySaiOi26m 1qsaVLS2plbWDnDmTKsWdfGu8XrJ+SbWNn1ipMO5CCakK/nALP3YcXB9W6CRB4pkC3m88xrxX yGrhLqzpb/4h+bPL5q6lN1h6QSCbexEQlsEPbUmi6PT5gpD+th9TIlcNC+mPBNoU96ErK6iq1 jlSULwVTNCjbYE680RYokygoHfqUpl9PPEhOVQ2eUCGJ1Y8iuTf9sDIZralnFp/bsKEt6fprs a4EvQnXUuHm8fXdYElJXufcKU27DuhMQG5WwAVLIQcXWLPuLZSo47ls/M8CwZbgwXC5W3tl7j 4chFR64U4Rj8iWOKr8i9yrMu74WHIzshbCHhKzi9+wqhFZ9V52U3ywygkygNg8/KR4pdDaPlg 6y4CH8UxIJeivGdtXbDrube1WLq5aX6sd2Kp3gd2EPIaqJv++yCrlNNuSjmEGjLvq2NokW8jl Mj9WUNs5NgxeAYcUbCp7j0ngE36GTt/U0YG1H+2cm24PojuJa62YFRBPoeWEb+gq1sWIy5pOc IngdSkB6OzchwvuBbV5rEk8KhzYdM9FJ8xTTZpTyiZwKM+yWxoc7zinR20cDVE+9ytKVdvxfO J3cng68l53xqB8RvUqlmi6p6i8Wz6PUnOytSD56uPB9Hp84T3zKkJaNfLAh3mUTwSpJvhU8fQ LXDfh/WzMguqUWak4s59Fd8BQRUS2ULc4QeCpgSkVndBKFXpoxEyXnGWXrN3oHI0Ag7E= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PATCH v2 8/8] linux-user: define TARGET_SO_REUSEPORT 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=20Mathieu-Daud=C3=A9?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/alpha/sockbits.h | 2 +- linux-user/generic/sockbits.h | 2 +- linux-user/mips/sockbits.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/linux-user/alpha/sockbits.h b/linux-user/alpha/sockbits.h index f5397dd875..d54dc98c09 100644 --- a/linux-user/alpha/sockbits.h +++ b/linux-user/alpha/sockbits.h @@ -18,7 +18,7 @@ #define TARGET_SO_BROADCAST 0x0020 #define TARGET_SO_LINGER 0x0080 #define TARGET_SO_OOBINLINE 0x0100 -/* To add :#define TARGET_SO_REUSEPORT 0x0200 */ +#define TARGET_SO_REUSEPORT 0x0200 =20 #define TARGET_SO_TYPE 0x1008 #define TARGET_SO_ERROR 0x1007 diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h index 5ad43eb0c8..c161f80626 100644 --- a/linux-user/generic/sockbits.h +++ b/linux-user/generic/sockbits.h @@ -29,7 +29,7 @@ #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_REUSEPORT 15 #ifndef TARGET_SO_PASSCRED /* powerpc only differs in these */ #define TARGET_SO_PASSCRED 16 #define TARGET_SO_PEERCRED 17 diff --git a/linux-user/mips/sockbits.h b/linux-user/mips/sockbits.h index 370d13ed86..0f022cd598 100644 --- a/linux-user/mips/sockbits.h +++ b/linux-user/mips/sockbits.h @@ -28,10 +28,7 @@ */ #define TARGET_SO_OOBINLINE 0x0100 /* Receive out-of-band data in-band. */ -#if 0 -/* To add: Allow local address and port reuse. */ #define TARGET_SO_REUSEPORT 0x0200 -#endif =20 #define TARGET_SO_TYPE 0x1008 /* Compatible name for SO_STYLE. */ #define TARGET_SO_STYLE SO_TYPE /* Synonym */ --=20 2.14.3