From patchwork Sat May 19 09:29:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 916793 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 40p0Ct1bCBz9s4n for ; Sat, 19 May 2018 19:31:21 +1000 (AEST) Received: from localhost ([::1]:42344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyCr-0008KD-Lp for incoming@patchwork.ozlabs.org; Sat, 19 May 2018 05:31:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44217) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyCI-0008K8-5C for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJyCE-00037H-4L for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:42 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:38045) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJyCD-00036i-Q4 for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:38 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LpNe1-1eesDJ24ZR-00fEsj; Sat, 19 May 2018 11:30:12 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 19 May 2018 11:29:49 +0200 Message-Id: <20180519092956.15134-2-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180519092956.15134-1-laurent@vivier.eu> References: <20180519092956.15134-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:/zanXABvn2PHdRcQKg1M77aFmIFH0tHh10AuzLbxepdLGMpzeya 8f/LGVvqPlIwQOJMPfDtpf9ysum2nooRhHtwEszG+9CTho54SciZveuIGYXTT8+5GskzcQo 8Tax/vxB+uS5QivbcxiVSNwVE/yrlwaLAbh89/MScI0tkqsiD2+CsKqIjj41A19+A6EEj+W 6HlqNHbXnvvZhF1jLcsaA== X-UI-Out-Filterresults: notjunk:1; V01:K0:CW6V6+Tp9fY=:26+sAu4u3KXUXRT+FlRWyf 4d9qYYFniY5vQU9cQ+juZQ6dtLN5yA/Igy0L1jDDSd2E22h7pJbY0LhqpkwmVkXg014sVvd5l WH9cl8xhoFNh7hdVtl/V/XZKUD59EWkU7An9l+ta2amHKTr5Lag3WWomre7Mg5eLaVn7ORrg4 gE0eygyKpGhWkpYnsbVNIGsC2hbsMkNBzqanA0KiHiUi0PAXiyKDnex+HEzU+L943mgObAaOi 6knv5VYWZ4Z0D5IzgvmL0ouio4WCQPwC0UnUfxlnfewwFzUPr9sVsE0hOh1GPE9/IGjPfanye Te26YjJBGvoAI8Xc/Fgzr35jU9Kqe4AZBtyf/6OvA/z3Fc5aIrEzQY5rFpVlDUHU1Kim4zZMe EScTj4+d3dIroaUNlE2KLnV07rYgS3HBTT8wg2dYojkCRFJxW+696njeS7wS4xX8zy6Z3Vlqt oTVbSU21tiTFW4frmcgo2B/ddH0bvw5QdKGkXyWb1qqEu+10o8NTifg8n5AXI4Dr5hkmKXslw lxXCMdNgS1tfLx503XphO/cWh6PusmTdvvT9RYzER0pNQ/ouBHDXVcUyJp1xhzign7LUkd89b S/yA+1bKKNm+55seGcv5GPFa3NBCa7+BgI2iOWTtYPwn34+4tBel9/QbrOkOqOImIcT1bFbaq ka/JTRmHmPDWhWbM/CY5COpDei7AKto1L4cYjcm6WKzOM8o/cTlOtcIK+DV/PkPr2Ef8FLZi4 QzW/cN3n6ti1uHmw 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 v3 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_Mathieu-Daud?= =?utf-8?b?w6k=?= , Yongbok Kim , 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 Reviewed-by: Philippe Mathieu-Daudé --- 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 = 1, + TARGET_SOCK_STREAM = 2, + TARGET_SOCK_RAW = 3, + TARGET_SOCK_RDM = 4, + TARGET_SOCK_SEQPACKET = 5, + TARGET_SOCK_DCCP = 6, + TARGET_SOCK_PACKET = 10, + TARGET_SOCK_CLOEXEC = 02000000, + TARGET_SOCK_NONBLOCK = 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 @@ -#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 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 = 1, - TARGET_SOCK_STREAM = 2, - TARGET_SOCK_RAW = 3, - TARGET_SOCK_RDM = 4, - TARGET_SOCK_SEQPACKET = 5, - TARGET_SOCK_DCCP = 6, - TARGET_SOCK_PACKET = 10, - TARGET_SOCK_CLOEXEC = 02000000, - TARGET_SOCK_NONBLOCK = 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) /* For setsockopt(2) */ @@ -205,8 +105,6 @@ #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 #if defined(TARGET_SPARC) From patchwork Sat May 19 09:29:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 916796 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 40p0DZ0dmkz9s4n for ; Sat, 19 May 2018 19:31:58 +1000 (AEST) Received: from localhost ([::1]:42347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyDT-00005H-LF for incoming@patchwork.ozlabs.org; Sat, 19 May 2018 05:31:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyCb-0008U4-DG for qemu-devel@nongnu.org; Sat, 19 May 2018 05:31:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJyCX-0003JV-7H for qemu-devel@nongnu.org; Sat, 19 May 2018 05:31:01 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:53275) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJyCW-0003Hn-TB for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:57 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M3B8p-1eR2Ju1ZPr-00su95; Sat, 19 May 2018 11:30:13 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 19 May 2018 11:29:50 +0200 Message-Id: <20180519092956.15134-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180519092956.15134-1-laurent@vivier.eu> References: <20180519092956.15134-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:9exBkD5eIMc64cjZUQ/BcS1mG55An6PpQ7utdvzZ2Yo4TD52ms8 zwk++I8vEEWtHqz4/sEOH3sge2YFm0JsvTtWYCBITdIdDSDxt09dns2u3+J3L0y8tIKljVb nD3qK+YuG7QXXZxgayEOboP0Sj0rBvF+QzgKQk24+J7YgBmqZ3v47o1NYIbpm2oMOm/7wTA MLFs0m5Cfar3pCfuHmN/Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:vapaBHTKttA=:w9L7ge9NlBxgDPcNh1mVPq 9EJnKT7GUNLH3yLdhq5Ubue5qzTKXaL50VT0FuoqEJIn4R0vkp/GFoLoW9HTGbFu4wQngwZZq hYwcwWZxeJrF57JtLRDWutq2r5tFp+4sYQHwsvCbKeajJkkBSPC7VGmQ3Gs1YJbMzyNTF0Ng0 wkb5W9+ukMhZWqWOMcVH5RjeaUX9xyO7lKg12p35h17CsyoIz4tziKfjwigB+R8fsy9AhYYMs UlUGeOC2QvvasmC4BSrJtJwDUk00L5I9nk+Gj/e8sNUPGeXXjvuFw4CcuLJYE28K3Ywi118i0 0o++haE+SvBSqvqpgsVvERtBtFHB9QsmStHLlndd9IU2UDkzvIbn5Wjbves/Oi8n9pRjVp/YK nbrViGz7YHa2QT5/vkljF/k/7tzYKRIqiWFGlALLF7zyYg601SyVT22OyxK1NN6f4C/NyS/+N xjUXaRZY60R9Sg9HLbvAGJrKLCZL494JQv25qL808UrvKAMv6jIGIVTCtqF2NO4GHQa91Alqm 0ITfaSoB/R28W8sTP6mBuD7yfNIBzfgefQq4JqFRHJ+xdK/86H+mZ7GC9UoBwGQK7vVJQRBLY HmtI4I3HmJVm5i4B+UeXiiqpQryybVaD8Wgv0h3yrE73D7fZrjqDSE+O7XJZDjwaUibMcC1/d vKY36TA35LWXA9LCAVbK88wSylb1+NQ6F7SbbAA79y1Kebya740dLGqYBm+9FxxjnQdbbdxzB DmFHkiH5utijMGZL 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 v3 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_Mathieu-Daud?= =?utf-8?b?w6k=?= , Yongbok Kim , 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 Reviewed-by: Philippe Mathieu-Daudé --- 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 = 1, + TARGET_SOCK_DGRAM = 2, + TARGET_SOCK_RAW = 3, + TARGET_SOCK_RDM = 4, + TARGET_SOCK_SEQPACKET = 5, + TARGET_SOCK_DCCP = 6, + TARGET_SOCK_PACKET = 10, + TARGET_SOCK_CLOEXEC = 010000000, + TARGET_SOCK_NONBLOCK = 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 @@ -#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 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 = 1, - TARGET_SOCK_DGRAM = 2, - TARGET_SOCK_RAW = 3, - TARGET_SOCK_RDM = 4, - TARGET_SOCK_SEQPACKET = 5, - TARGET_SOCK_DCCP = 6, - TARGET_SOCK_PACKET = 10, - TARGET_SOCK_CLOEXEC = 010000000, - TARGET_SOCK_NONBLOCK = 010000000000, - }; - - #define TARGET_SOCK_MAX (TARGET_SOCK_PACKET + 1) - #define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-1. */ #else #if defined(TARGET_SPARC) From patchwork Sat May 19 09:29:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 916794 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 40p0D414pRz9s4n for ; Sat, 19 May 2018 19:31:32 +1000 (AEST) Received: from localhost ([::1]:42345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyD3-0008Mh-Pm for incoming@patchwork.ozlabs.org; Sat, 19 May 2018 05:31:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyCM-0008LS-UK for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJyCI-00039H-Vz for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:46 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:49663) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJyCI-00038N-KG for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:42 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LtnUL-1eIkqZ0ubF-0117L7; Sat, 19 May 2018 11:30:14 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 19 May 2018 11:29:51 +0200 Message-Id: <20180519092956.15134-4-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180519092956.15134-1-laurent@vivier.eu> References: <20180519092956.15134-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:w7Y77OyZuLORM9n1TZWk/0y8vje9A1+4ITyQhLDe91AIMquho5Q kU/GSSVz3HIei85CtZlRpHTETrEmY944ElWUdLJK6Ir7o2HNGLyQqxZJY/GXMoGbva3UzXA cdK1NtRe8Rs+5dCQ4/RN5gwf+NKJ32a/wcrcRYXY/W9vdpHjSUM3g6Zqlna1RPTg5c8ExR6 eEM7zUE8fM6Jemd64I3ig== X-UI-Out-Filterresults: notjunk:1; V01:K0:UsHMOd+Yt/k=:8dNPxdzr4mWpnzKPiyTR5Z 0k9JtyeDKal42sYzpULYy4GpNRif9YFWnLJir5YxedQ+U8m0EgnNsuVABvWs7r7TPz1HBRrO1 ZT6cqmK9u1JaZyhzfYKMYN8TulSrNtSGFbzrHYJWxHnw0bUCIPW0dHJTVFpIsa3X+EVuGsIMs iaixGUXhQMMW2c0oBgp5v3tQ+L4XTKIpvm9D7LD8o+Iekm7zARv1JQHvkSATB4Cqbbt1yfkWt rPq3eN/97u38Se6B36+zl2aaEPStwZ36ruL0wszuYFCRCOZ3OJqxbKa16LxEQWdlkUFg4ADCW yQuqRycOUIgh7PFh3vxjj8r2e+g+kEWiiR4SIlsTWvB0P1CgogZvi8vsok9pQZ2+pkGWnpox1 nc+YV4rKf8FW5E9JlEaPy+O9/3ZYYf6J1S5NMXd3gghaBxLBInd4B7X7ou7BKg0kDHsnoL8RS 4S0CuksZkYBk35w05U3ec0nNZGNQe4jDgi1asAaofBCNElXrNIQpBjggaOuCHmOZMeM/tR/XO OotffM2Xdi9MrnEu5ljX7xrH9bkLZQf9CVp/+lhQOygFfHJhfMOxw2awAyOdHt+uSfojqRQOp N6WiPJGGJg0cWWgmnATBTklJfqv0zUL0qow9+3QrT11CajtCc0tnYL9kMr1Vn5O3ukD0+sLND kAKvg4sOsCgeY3tt1KtQmYIfB2OQonzf+aUOd+uHtw1OdVNUL2iMpSGw4BjT8uEKh5mzRNwtY 5T8Z42+JHRLOVcBD 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 v3 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_Mathieu-Daud?= =?utf-8?b?w6k=?= , Yongbok Kim , 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 Reviewed-by: Philippe Mathieu-Daudé --- 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 @@ -#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 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 = 1, - TARGET_SOCK_DGRAM = 2, - TARGET_SOCK_RAW = 3, - TARGET_SOCK_RDM = 4, - TARGET_SOCK_SEQPACKET = 5, - TARGET_SOCK_DCCP = 6, - TARGET_SOCK_PACKET = 10, - TARGET_SOCK_CLOEXEC = 020000000, - TARGET_SOCK_NONBLOCK = 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 /* 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 = 1, + TARGET_SOCK_DGRAM = 2, + TARGET_SOCK_RAW = 3, + TARGET_SOCK_RDM = 4, + TARGET_SOCK_SEQPACKET = 5, + TARGET_SOCK_DCCP = 6, + TARGET_SOCK_PACKET = 10, + TARGET_SOCK_CLOEXEC = 020000000, + TARGET_SOCK_NONBLOCK = 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" From patchwork Sat May 19 09:29:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 916807 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 40p0MG4RBnz9s4w for ; Sat, 19 May 2018 19:37:46 +1000 (AEST) Received: from localhost ([::1]:42371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyJ6-0005IG-BR for incoming@patchwork.ozlabs.org; Sat, 19 May 2018 05:37:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyCY-0008Tl-PY for qemu-devel@nongnu.org; Sat, 19 May 2018 05:31:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJyCX-0003JN-56 for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:58 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:52445) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJyCW-0003He-Om for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:57 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M25kJ-1ePvrQ05Rj-00u04t; Sat, 19 May 2018 11:30:15 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 19 May 2018 11:29:52 +0200 Message-Id: <20180519092956.15134-5-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180519092956.15134-1-laurent@vivier.eu> References: <20180519092956.15134-1-laurent@vivier.eu> X-Provags-ID: V03:K1:a8tbSAhtcWX3QOCYZWdsNdyK+lCkUbpItfzPS5LsE6po5rJ18Zr OTyCmNguyA9CkLYhWIp0WZElvHCDG8cS8tYrUC6wmXS/vhzg22oUljV2UEqZ2qIlrjd4fwm VhwLq/KU4BjbwyIv6IqUKLJa8WVUwcaAvZoRghphrpdYXRgHHQS5dvFujxCjPlkB/5+1vXu CNgbs+c7hwVHvWibs5iBA== X-UI-Out-Filterresults: notjunk:1; V01:K0:MfZ+hZhS6dI=:6lt02eu8kFj7mTntgfebHD /cWhk8nvZRNFibiDxACgBtpO6OVLWkwI3+EHe1eKoFfR8QuJMRkLPHOKoG/akv86CoYkYUXtO fh0hmLrrkBkjZB+hZxU+s0Cty9RpXP1iIGPe3kxVFYusxzfV+gBIDVfVxCBQJ2AruSJM1zMpk LbxIXo59xkUt9F0V8vtieNsuBd0ccp+JZK1vRty8ie1sdoCAB5UjcHNPRVpKSeR87vS9Cisnd CLa2capKknvVq5ehbfjNrO7yj8Cd9EKWtcumEAJVcWkjk7PFO6n27LEcHROKeoSTIUpRw5ZZQ TdYBbt+I7K4qXH9sFbx59cra9fgw32Q7xXTk8Y8NkIp4CXhQ1WGt6UZnX/skMnbnAd2lO3pV/ SVbrdOZtlp8i7j9ZnXx6TxkyHAzLoyBBiAUwMvZdet7KsgFDxfGZBW9ujnI50R6fquxoUApzj Hhp+vIQfwuk5JwWG7GrXLp4+haTMDCh0G0h6ybH9iJd40ap8pcBUg1Fe6PkUusOV65LGfe77j 95qj8cTDdvlwEzXxV/FwWTFb9WLfF5081jAsL1aDdjkOIjMeQs9KAAQvGK1y0Pndw+l2wj1Eq PsnrLWNxoSbzwIlhE6SuiEXw01PQEDBePmcIoHiBY6F+2jazagp6DnEQVO+3KlZw/eAjqld6c YrBM2xfx03Cj+ixsIZ+uoZAHTcXh6Q22TV7yIro9qp2K1ulldSL0V8xp3a2N+k3iEkiw= 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 v3 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_Mathieu-Daud?= =?utf-8?b?w6k=?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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/sockbits.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 @@ -#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 #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" From patchwork Sat May 19 09:29:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 916808 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 40p0Nk2SDYz9s4w for ; Sat, 19 May 2018 19:39:02 +1000 (AEST) Received: from localhost ([::1]:42374 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyKK-0005s3-3C for incoming@patchwork.ozlabs.org; Sat, 19 May 2018 05:39:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyCc-0008V6-Ap for qemu-devel@nongnu.org; Sat, 19 May 2018 05:31:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJyCY-0003L7-E7 for qemu-devel@nongnu.org; Sat, 19 May 2018 05:31:02 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:37683) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJyCY-0003Jd-4B for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:58 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M9XvL-1f6zt23jhf-00CznP; Sat, 19 May 2018 11:30:16 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 19 May 2018 11:29:53 +0200 Message-Id: <20180519092956.15134-6-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180519092956.15134-1-laurent@vivier.eu> References: <20180519092956.15134-1-laurent@vivier.eu> X-Provags-ID: V03:K1:o423Ts2BaVnkRfuLuacIEFewko8Ig7rzW88M/HnnriW8OCWw7Yb mCirwp12cE5WKJh7kMgN+7bpne9zs+81i73aGzRKLF8j2xNyScwN14vVZo7TkCznruAEsYk A+13zpxhry/BcKiT65O4Ew57xYTG8lsstBRnaRIMLsedQbhyMF4TpP2kmzgI6BEjJg1Bh+T Cmx47qUzT5fYGApwISSCQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:24lzgbtWyDo=:ARS//R9ZjAe9tMIh58H8XD xdlAi+/mCmZfKLDjZ4qGIZxZWIP6/nIh5MFyL/zRDVCAgYXBeViIg91BB5rC8qZOYfDGUTCU8 Bpt30pBirYkJD+Gdz2fgR913PdoNGI8Uh/g2X23+KH6TxAMOvtjoAUBBsPORKbMpTRKBvAnLn rYBTTvBaZ1urXjzyl5QBhDzFBOWHfsM+RinPv7DfKXvLWM3Rb+z3QYMbES/yzXdfrldnSSl8M HbwIBr0ndW+22/Se9xY/1Cn9/IymERg+8rVsvgnSdZG/fbWPVantpJgP0s7hgWrZwIoAm8Ibd fN/J4ww4d4dmPniGaXI7fup82HDbwY/chxnGy40KVETwiuX6X2HYTQv1h0IdV1+cwNACp7TBP JCSXTqJfFS/qeNaFW7l/joJs+I0E9RHkQCbLMR/1zExM8UbCffz9TcLK2Q1JTJj9MuB7MRkJ/ kfIPlopuW9FB4sEVh9EbCU4SB+uzO2thcp1cbnuFLdWlQF70JYsLQUtsUEEglsLxpAWPZQ9pu L0zhDWplgPMOdXazyInFOP5hRsvgJLCAkZX3vgcgodCiGAb+Zc6oL6raNO/RLrKMqD8SVJo79 QWMQaoB6IiLESTKORxEfyQcsL5s2b1LlEKTXWlhLay9E5fZJAW66nnf20l2JNX2MAbzZBOCel StvHppRzmDoLoWeiqeVraOoQwnO7FKC0EuNDzPhUAbqkScHC3ZG1zrdynJ6tuUwblZLE= 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 v3 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_Mathieu-Daud?= =?utf-8?b?w6k=?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Change conditional #ifdef part by #undef of the symbols redefined for PPC relative to generic/socket.h Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell --- linux-user/generic/sockbits.h | 9 --------- linux-user/ppc/sockbits.h | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h index 093faf0a48..99505f1f85 100644 --- a/linux-user/generic/sockbits.h +++ b/linux-user/generic/sockbits.h @@ -30,21 +30,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 diff --git a/linux-user/ppc/sockbits.h b/linux-user/ppc/sockbits.h index 0e4c8f012d..ee453347a3 100644 --- a/linux-user/ppc/sockbits.h +++ b/linux-user/ppc/sockbits.h @@ -1 +1,26 @@ +/* + * 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 + #include "../generic/sockbits.h" + +#undef TARGET_SO_RCVLOWAT +#define TARGET_SO_RCVLOWAT 16 +#undef TARGET_SO_SNDLOWAT +#define TARGET_SO_SNDLOWAT 17 +#undef TARGET_SO_RCVTIMEO +#define TARGET_SO_RCVTIMEO 18 +#undef TARGET_SO_SNDTIMEO +#define TARGET_SO_SNDTIMEO 19 +#undef TARGET_SO_PASSCRED +#define TARGET_SO_PASSCRED 20 +#undef TARGET_SO_PEERCRED +#define TARGET_SO_PEERCRED 21 + +#endif From patchwork Sat May 19 09:29:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 916806 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 40p0Kh6ZfFz9s4w for ; Sat, 19 May 2018 19:36:23 +1000 (AEST) Received: from localhost ([::1]:42366 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyHk-0004Pw-Pl for incoming@patchwork.ozlabs.org; Sat, 19 May 2018 05:36:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyCY-0008TW-HM for qemu-devel@nongnu.org; Sat, 19 May 2018 05:31:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJyCX-0003J6-2d for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:58 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:51905) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJyCW-0003Hc-Oh for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:57 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MPoeo-1fF2FO2kIE-0055Jm; Sat, 19 May 2018 11:30:17 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 19 May 2018 11:29:54 +0200 Message-Id: <20180519092956.15134-7-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180519092956.15134-1-laurent@vivier.eu> References: <20180519092956.15134-1-laurent@vivier.eu> X-Provags-ID: V03:K1:kHE52ogRXi/ZPKumaZNGtC4GspaH34bI2izEH70AnOeuazxkBtP 7KNZ1jue4/urcFTUrkJrWXA7n6Oi4EOQc+lgfsxVh6vwVVKj8a2JVQeFPV//vcJLv6rBQUR oIiWsjYQ9czwZ8lrDUu49bFuVCi8VhQ7pFxxPjYVzVPKwm28lXjQ+hpwF6BWfbRKgdRgd8Y 27djGSHjZcP1jZpXhVHEg== X-UI-Out-Filterresults: notjunk:1; V01:K0:ug/+AlXq0nI=:Fv0ITsF+Z5yVGskWo1Q2Sg FoeIKaeB+pZC6XQTDU+P5rZLtibj8vnLABgsoXAICBD0vD8uUYJ3pzBpc+Aj/FCOi9bbD+HIQ XqNxUehV6ZZdNbkqDbDJ9DRxxIb3otthK4gwNwR+jOsnUjl2zPPhnll50e8HTa/n/LoL/SqCa 0+eF4xxHvV7jh4YgurAmLiJfxmNryAfC8IIIckrx3eqcKzXUKO47JF1CEPAnjnCv1USUX7Uno J0u+LrVgseW7rgNDhwtIt9fyEMg8Xv+xpLLPto9rPOobQIsgaPW0QlrHmoGrPiUPYULlK2vFP xjxJDvfso2ui/YBaUpnC9Sknpx4kuAob7TKWY61Z52ic6iuei3HnpjPI8ReqvD7VvC4kAsnvW oDXmsLkyJFXHfQ254EZWl4/1BV12cSfOt04TFBvShgACXbMAgVt3Brc+wExskcdA3CJJzFFLK 0kx1QjNiQ+31qWapFBTdYoITIuFUxpTVOeyof4lMo+hfeiHHVbTEbgEV46PwWfStd9cmHbq+T nvtVMpdGn903UOa1qYY6zlRBca6VxwC/5t2IxcxhoeXKeBLxDFaTXJ5d2R1jUPpZMKkzPf/l+ H47VFvZDgOBC5t9niCjvYvzb2MEq3sqTIb8jk9pBrF4Dkz1DsCURLDp4MgfMzE400HEkpfkK0 xUlzq8q8lyZnaniWMN1JRkOYnH7WDIzf+tALAzriWm5Qnc30f9nIdLKdSRBksOcom8CI= 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 v3 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_Mathieu-Daud?= =?utf-8?b?w6k=?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" to be like in the kernel and rename it TARGET_ARCH_HAS_SOCKET_TYPES Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell --- 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 -/** 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. Therefore we + * have to define SOCK_NONBLOCK to a different value here. */ +#define TARGET_SOCK_NONBLOCK 0x40000000 -#define ARCH_HAS_SOCKET_TYPES 1 - -enum sock_type { - TARGET_SOCK_STREAM = 1, - TARGET_SOCK_DGRAM = 2, - TARGET_SOCK_RAW = 3, - TARGET_SOCK_RDM = 4, - TARGET_SOCK_SEQPACKET = 5, - TARGET_SOCK_DCCP = 6, - TARGET_SOCK_PACKET = 10, - TARGET_SOCK_CLOEXEC = 010000000, - TARGET_SOCK_NONBLOCK = 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 @@ #define TARGET_SO_CNX_ADVICE 0x402E -/** 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. Therefore we + * have to define SOCK_NONBLOCK to a different value here. */ -enum sock_type { - TARGET_SOCK_STREAM = 1, - TARGET_SOCK_DGRAM = 2, - TARGET_SOCK_RAW = 3, - TARGET_SOCK_RDM = 4, - TARGET_SOCK_SEQPACKET = 5, - TARGET_SOCK_DCCP = 6, - TARGET_SOCK_PACKET = 10, - TARGET_SOCK_CLOEXEC = 010000000, - TARGET_SOCK_NONBLOCK = 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. */ -#define ARCH_HAS_SOCKET_TYPES 1 +#define TARGET_ARCH_HAS_SOCKET_TYPES 1 enum sock_type { TARGET_SOCK_DGRAM = 1, @@ -101,10 +101,13 @@ enum sock_type { TARGET_SOCK_SEQPACKET = 5, TARGET_SOCK_DCCP = 6, TARGET_SOCK_PACKET = 10, - TARGET_SOCK_CLOEXEC = 02000000, - TARGET_SOCK_NONBLOCK = 0200, }; #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..4c0b5c2dfa 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -1,35 +1,37 @@ - #include "sockbits.h" -#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 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 = 1, - TARGET_SOCK_DGRAM = 2, - TARGET_SOCK_RAW = 3, - TARGET_SOCK_RDM = 4, - TARGET_SOCK_SEQPACKET = 5, - TARGET_SOCK_DCCP = 6, - TARGET_SOCK_PACKET = 10, - TARGET_SOCK_CLOEXEC = 02000000, - TARGET_SOCK_NONBLOCK = 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 = 1, + TARGET_SOCK_DGRAM = 2, + TARGET_SOCK_RAW = 3, + TARGET_SOCK_RDM = 4, + TARGET_SOCK_SEQPACKET = 5, + TARGET_SOCK_DCCP = 6, + TARGET_SOCK_PACKET = 10, +}; - #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. */ +/* Flags for socket, socketpair, accept4 */ +#define TARGET_SOCK_CLOEXEC TARGET_O_CLOEXEC +#ifndef TARGET_SOCK_NONBLOCK +#define TARGET_SOCK_NONBLOCK TARGET_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 -/** 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 = 1, - TARGET_SOCK_DGRAM = 2, - TARGET_SOCK_RAW = 3, - TARGET_SOCK_RDM = 4, - TARGET_SOCK_SEQPACKET = 5, - TARGET_SOCK_DCCP = 6, - TARGET_SOCK_PACKET = 10, - TARGET_SOCK_CLOEXEC = 020000000, - TARGET_SOCK_NONBLOCK = 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) */ From patchwork Sat May 19 09:29:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 916805 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 40p0Hn3vtHz9s4n for ; Sat, 19 May 2018 19:34:45 +1000 (AEST) Received: from localhost ([::1]:42356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyGB-0002Iy-8H for incoming@patchwork.ozlabs.org; Sat, 19 May 2018 05:34:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyCY-0008TT-Fs for qemu-devel@nongnu.org; Sat, 19 May 2018 05:31:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJyCU-0003Fb-AN for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:58 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:37661) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJyCT-0003Dt-WD for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:54 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MRDId-1epKVi28Dv-00UWgF; Sat, 19 May 2018 11:30:17 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 19 May 2018 11:29:55 +0200 Message-Id: <20180519092956.15134-8-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180519092956.15134-1-laurent@vivier.eu> References: <20180519092956.15134-1-laurent@vivier.eu> X-Provags-ID: V03:K1:8gaPI7yeDStCLZ5HGUNy8LZ+kNzTh27SV7NoKz5PWPTM+oVkWkG 1BHBQddm7fSBJbW5I5zEAywrvVLHD72gFvYdjcGsSlJm1KAQ2Km6avM9UsqkB8uFtBsYZlo Vj9IG/NvdOM0uBAhDlGnnzaBB/LR3mRNPl00TEn2OS8atwA0zVZH9nmLSIlgoz70oMA5hrH pEGmU1JNS09yTb1L78tsg== X-UI-Out-Filterresults: notjunk:1; V01:K0:MBvUcNuwzqI=:3Dw7ldeCnQTst8TqANSQV4 VcykP6NSetuOeeXf0cP+QAo9Po16Mkq54IimN5PwUKqJBiHWA+t8oL3OtbY4UNe32ZF/vKom2 6MkcoXRhHVo/4Jmfoj68Jdo4OYSHtP+W94kSud96NEb7EC5IMTFC/ZA69Pk3ise9ht2STJKRM cbNidqAWx+wBwhZNAzkUBbMRXvxlfpSHVjjI17hDMxEIaz9bcspoY+iUQAgJGIWAb0Fi9sQEP /x8jl0ljlxAjVGeco4sYDThrRXFAX4MubhbO7zePpJoshCdaioYuHMf6v2xQl+GM8OIRNctf7 hEOq3jx6PgpGcheasfr//X2x8pNrtT5FxHut5uazo2HrnEZIqCOk/GXy+4TPOxOj6iNK84fA3 FY68Dy99kDtL1UFqrZKgx7SfPB7cWJIpllVbENzjuxEIo55Y4TPr8Bz86TSh+KrjByp3Wztnj wdcD8xcLtGAFCrGDioyhCdKr4n0G8prLz/4YC2p8Yo6AHaKS/khVpwmfkQzHUfW4wRIJHoarc BliRHEaIa6GHGd6KaH6cmUxY4dTYpGHzMvZaA9GpdqT0VnDffHWJ8pRlzRr50+EetKrfmxj+A 2dVJkFk1U1ADxQ2jn7cNGYZztzai8dPQzw/gneeIZFh6RXa0BhviWPWmkL+xKIqI+c8ZjYfBe sNXsgIwfWJ1G0YQakVNyXw2Vi4xvoqgn+hTOCqvFeE4zGp/M4atSViWMwc4orKuOWgZU= 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 v3 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 From patchwork Sat May 19 09:29:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 916804 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 40p0HN5X5Gz9s4n for ; Sat, 19 May 2018 19:34:24 +1000 (AEST) Received: from localhost ([::1]:42353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyFq-00021j-GO for incoming@patchwork.ozlabs.org; Sat, 19 May 2018 05:34:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyCW-0008S3-H6 for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJyCS-0003Cz-IP for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:56 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:39015) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJyCS-0003C2-8V for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:52 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MI6Uo-1fG6ZY1Fio-003xFq; Sat, 19 May 2018 11:30:18 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 19 May 2018 11:29:56 +0200 Message-Id: <20180519092956.15134-9-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180519092956.15134-1-laurent@vivier.eu> References: <20180519092956.15134-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:xvvWEa2DsYsEVRUhCgaLFok8a5Jof1V46eU9bu9cileOMeGNvY5 HXb0bPRKjnxuYVAbVTJgJfPXiw73U74vdT60RkjpuQAcoG4XDAvQwrPZs1XBzudM1cFoIpR O/sP9JzFe97mW6pdI8Cw6ppqw59yS+z3BcOINatU+LTM2e+TZs0sWa8JFYIeWr/hVk7Kc7z j5LP6VwWLGkvfSNyBsWsw== X-UI-Out-Filterresults: notjunk:1; V01:K0:wKWirdxS1m4=:ZmEu5/KRUbaXysmg8WJ/4h ubz8up3Bgda6AEtkIygJV73VW6aiZFWTusLz+qIZPYSNMJfOg1zYOuPXlVju5hIZCSB/Snow3 +zOsxEZcMktydsjwHHhAw8sC/zfxdK5E1P4LdDsDWwcrMSt8RzgLhY0bJnEY1jAVQCRqS1X8s B58UmkL0e8fQBiZ4VAU7n+JQHbNjPdhewcsaBoCWT6/88viovPfX7bWnQxNWZB0g0Kg++bs4b t+cJBfpei78tme93K0GfPEPwPYf1KYuCMn+rt56/CJK/udhQAbhGkRdhTceFesVHcDxKy5ZEs qWpt8TlWVdVhE33jurk2j1ZmQq2e8+sZUkg0xof+F3moBAWKEnfuH+jQCDKz9k/0wNqvAZJqo KTzOUSUDHOLb1QiWjcP593HbTCbaeyo25g35JhPguxpUspW/B18QZPA1Cl8E04PSo/ManrFWR eMRPAurgIjBMQNGVqT9MQ9X+MKC6xHNmPbJgvDTFTnerU6MV2Nhd7An24rl3DSTjIiKA8SPwJ gx8BfPRybOEEXLjBWZb8Pd4TV7FsqNEVgXE6U5Mwey8ZGwpt41bo1d81EKbJ6D/aeeW+PyV9e adavqDU2ubhiGVO840fMXIt71Eu+vdddfkoIYAJ8UV1ie8GfikEHC9K0R2z/8jRN5f3HXBHKs X32cg+rizZaaKChlVyQ61BFfqk7oZK6LRTYN83lDi8m55JV/lDUXMurNQw6/cqBvs71WT3LNe zvpPiUlA5PBfX36f 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 v3 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_Mathieu-Daud?= =?utf-8?b?w6k=?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé --- 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 #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 99505f1f85..e44733c601 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 #define TARGET_SO_PASSCRED 16 #define TARGET_SO_PEERCRED 17 #define TARGET_SO_RCVLOWAT 18 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 #define TARGET_SO_TYPE 0x1008 /* Compatible name for SO_STYLE. */ #define TARGET_SO_STYLE SO_TYPE /* Synonym */