From nobody Sat Apr 27 16:18:02 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; dkim=fail; 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 1506089226910696.8315656291684; Fri, 22 Sep 2017 07:07:06 -0700 (PDT) Received: from localhost ([::1]:59093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvObc-0000tr-TN for importer@patchew.org; Fri, 22 Sep 2017 10:07:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvOXq-0006uI-UM for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvOXo-0001Lr-Fc for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:06 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:38471) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvOXo-0001Kz-7n for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:04 -0400 Received: by mail-pf0-x242.google.com with SMTP id a7so497430pfj.5 for ; Fri, 22 Sep 2017 07:03:02 -0700 (PDT) Received: from localhost.localdomain (c-73-189-82-67.hsd1.ca.comcast.net. [73.189.82.67]) by smtp.gmail.com with ESMTPSA id d124sm6428901pfc.42.2017.09.22.07.02.59 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Sep 2017 07:03:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nUnFhQjDtuACO2B5a1N/0od86xFU2wlqFzSxdLp9w90=; b=fOxyJJ3dccJMSkVx7i4VVhBUdBO9JzvjLOH9AjHOpJLiA+sb5+O6mCXfAnIMwTZUsO hxFHCIOZy0kGE/BCGymfl9Co5xIZxmCnHcU91kxDtIwHLWxNp43ZEQJ/gSBsrTggKh7O zs02EzzbeoJL9O96T/Mljt9DZF7+8ZhmZpIcknDukIJwdidS3Uu8LmW8rNxJKIdNL7xu CUXmgUzMQjtWv+ZQ5Q0lKHxdRw03ylfSgpz/7nmawY7Ts1Mf2kD7R2fAk51H4/P31BIf uRhHimg9MzsHjyHMTA9pruk+z4vds/NMU51C5mdbYeU8Ng2KKmG0Bqei/GwPTOlgCqu9 wGUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nUnFhQjDtuACO2B5a1N/0od86xFU2wlqFzSxdLp9w90=; b=KpgieW5+MaEibT+jMQTsR8l8uvAeyiuXSDB/ZAfB+I7Gc6EAoELtxU6bpWpjZmspvm y2gX0Zj0CD7ztPaONpg+ShoPULVmf660M7Y3XPjptVzbX1Td6WJ/ALLype7bv0l1wZ3t JLdb9PC6CZD0dCI4KWIlXhC6pclGvmjlx9zpEwRZdfoXxJs0rUWGm7fh3Zla+ucHzUVd oWZ4ZrJdJgmkFgaeIbInTLbhtqSjrQx+vokI9iM8xD02Awrz81xTuB9KWU9lxT5SK9XW qNXFIB6GR4OQCSSSgjFgtvv4yQ+fPh2CKq5tkBazSds74hosxz7Ux+JKZJj9vZNOzy1k xo1A== X-Gm-Message-State: AHPjjUitYULCMBfUF8rtbnQSp7B0exekTx9WR6xfndYldeOJpHZpeirf gehL8s7Q4LX3eyBXUQTk5Rvo6Nnk X-Google-Smtp-Source: AOwi7QCE6oOwRM1b6dHeXsayqiKVuHcWs4X+o7LUHmw+/sfy2nLwE1PSEJCk3Uce4fB8UjCddPZ6AQ== X-Received: by 10.98.144.142 with SMTP id q14mr9274681pfk.303.1506088981619; Fri, 22 Sep 2017 07:03:01 -0700 (PDT) From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 07:02:32 -0700 Message-Id: <20170922140237.10869-2-carenas@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170922140237.10869-1-carenas@gmail.com> References: <20170922140237.10869-1-carenas@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [RFC 1/6] linux-user: update hppa sockbits 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: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= , riku.voipio@iki.fi, laurent@vivier.eu, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 updated to match arch/parisc/include/uapi/asm/socket.h from linux 4.14 Signed-off-by: Carlo Marcelo Arenas Bel=C3=B3n --- linux-user/hppa/sockbits.h | 148 +++++++++++++++++++++++------------------= ---- linux-user/socket.h | 2 +- 2 files changed, 78 insertions(+), 72 deletions(-) diff --git a/linux-user/hppa/sockbits.h b/linux-user/hppa/sockbits.h index 5044619e16..3dab31a76a 100644 --- a/linux-user/hppa/sockbits.h +++ b/linux-user/hppa/sockbits.h @@ -1,71 +1,77 @@ -#define TARGET_SOL_SOCKET 0xffff +#define TARGET_SOL_SOCKET 0xffff =20 -#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 -#define TARGET_SO_REUSEPORT 0x0200 -#define TARGET_SO_SNDBUF 0x1001 -#define TARGET_SO_RCVBUF 0x1002 -#define TARGET_SO_SNDBUFFORCE 0x100a -#define TARGET_SO_RCVBUFFORCE 0x100b -#define TARGET_SO_SNDLOWAT 0x1003 -#define TARGET_SO_RCVLOWAT 0x1004 -#define TARGET_SO_SNDTIMEO 0x1005 -#define TARGET_SO_RCVTIMEO 0x1006 -#define TARGET_SO_ERROR 0x1007 -#define TARGET_SO_TYPE 0x1008 -#define TARGET_SO_PROTOCOL 0x1028 -#define TARGET_SO_DOMAIN 0x1029 -#define TARGET_SO_PEERNAME 0x2000 -#define TARGET_SO_NO_CHECK 0x400b -#define TARGET_SO_PRIORITY 0x400c -#define TARGET_SO_BSDCOMPAT 0x400e -#define TARGET_SO_PASSCRED 0x4010 -#define TARGET_SO_PEERCRED 0x4011 -#define TARGET_SO_TIMESTAMP 0x4012 -#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP -#define TARGET_SO_TIMESTAMPNS 0x4013 -#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS +#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 +#define TARGET_SO_REUSEPORT 0x0200 +#define TARGET_SO_SNDBUF 0x1001 +#define TARGET_SO_RCVBUF 0x1002 +#define TARGET_SO_SNDBUFFORCE 0x100a +#define TARGET_SO_RCVBUFFORCE 0x100b +#define TARGET_SO_SNDLOWAT 0x1003 +#define TARGET_SO_RCVLOWAT 0x1004 +#define TARGET_SO_SNDTIMEO 0x1005 +#define TARGET_SO_RCVTIMEO 0x1006 +#define TARGET_SO_ERROR 0x1007 +#define TARGET_SO_TYPE 0x1008 +#define TARGET_SO_PROTOCOL 0x1028 +#define TARGET_SO_DOMAIN 0x1029 +#define TARGET_SO_PEERNAME 0x2000 +#define TARGET_SO_NO_CHECK 0x400b +#define TARGET_SO_PRIORITY 0x400c +#define TARGET_SO_BSDCOMPAT 0x400e +#define TARGET_SO_PASSCRED 0x4010 +#define TARGET_SO_PEERCRED 0x4011 +#define TARGET_SO_TIMESTAMP 0x4012 +#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP +#define TARGET_SO_TIMESTAMPNS 0x4013 +#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS =20 -#define TARGET_SO_SECURITY_AUTHENTICATION 0x4016 -#define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 0x4017 -#define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 0x4018 +#define TARGET_SO_SECURITY_AUTHENTICATION 0x4016 +#define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 0x4017 +#define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 0x4018 =20 -#define TARGET_SO_BINDTODEVICE 0x4019 -#define TARGET_SO_ATTACH_FILTER 0x401a -#define TARGET_SO_DETACH_FILTER 0x401b -#define TARGET_SO_GET_FILTER TARGET_SO_ATTACH_FILTER -#define TARGET_SO_ACCEPTCONN 0x401c -#define TARGET_SO_PEERSEC 0x401d -#define TARGET_SO_PASSSEC 0x401e -#define TARGET_SO_MARK 0x401f -#define TARGET_SO_TIMESTAMPING 0x4020 -#define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING -#define TARGET_SO_RXQ_OVFL 0x4021 -#define TARGET_SO_WIFI_STATUS 0x4022 -#define TARGET_SCM_WIFI_STATUS TARGET_SO_WIFI_STATUS -#define TARGET_SO_PEEK_OFF 0x4023 -#define TARGET_SO_NOFCS 0x4024 -#define TARGET_SO_LOCK_FILTER 0x4025 -#define TARGET_SO_SELECT_ERR_QUEUE 0x4026 -#define TARGET_SO_BUSY_POLL 0x4027 -#define TARGET_SO_MAX_PACING_RATE 0x4028 -#define TARGET_SO_BPF_EXTENSIONS 0x4029 -#define TARGET_SO_INCOMING_CPU 0x402A -#define TARGET_SO_ATTACH_BPF 0x402B -#define TARGET_SO_DETACH_BPF TARGET_SO_DETACH_FILTER +#define TARGET_SO_BINDTODEVICE 0x4019 +#define TARGET_SO_ATTACH_FILTER 0x401a +#define TARGET_SO_DETACH_FILTER 0x401b +#define TARGET_SO_GET_FILTER TARGET_SO_ATTACH_FILTER +#define TARGET_SO_ACCEPTCONN 0x401c +#define TARGET_SO_PEERSEC 0x401d +#define TARGET_SO_PASSSEC 0x401e +#define TARGET_SO_MARK 0x401f +#define TARGET_SO_TIMESTAMPING 0x4020 +#define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING +#define TARGET_SO_RXQ_OVFL 0x4021 +#define TARGET_SO_WIFI_STATUS 0x4022 +#define TARGET_SCM_WIFI_STATUS TARGET_SO_WIFI_STATUS +#define TARGET_SO_PEEK_OFF 0x4023 +#define TARGET_SO_NOFCS 0x4024 +#define TARGET_SO_LOCK_FILTER 0x4025 +#define TARGET_SO_SELECT_ERR_QUEUE 0x4026 +#define TARGET_SO_BUSY_POLL 0x4027 +#define TARGET_SO_MAX_PACING_RATE 0x4028 +#define TARGET_SO_BPF_EXTENSIONS 0x4029 +#define TARGET_SO_INCOMING_CPU 0x402A +#define TARGET_SO_ATTACH_BPF 0x402B +#define TARGET_SO_DETACH_BPF TARGET_SO_DETACH_FILTER =20 -#define TARGET_SO_ATTACH_REUSEPORT_CBPF 0x402C -#define TARGET_SO_ATTACH_REUSEPORT_EBPF 0x402D +#define TARGET_SO_ATTACH_REUSEPORT_CBPF 0x402C +#define TARGET_SO_ATTACH_REUSEPORT_EBPF 0x402D =20 -#define TARGET_SO_CNX_ADVICE 0x402E +#define TARGET_SO_CNX_ADVICE 0x402E +#define TARGET_SCM_TIMESTAMPING_OPT_STATS 0x402F +#define TARGET_SO_MEMINFO 0x4030 +#define TARGET_SO_INCOMING_NAPI_ID 0x4031 +#define TARGET_SO_COOKIE 0x4032 +#define TARGET_SCM_TIMESTAMPING_PKTINFO 0x4033 +#define TARGET_SO_PEERGROUPS 0x4034 +#define TARGET_SO_ZEROCOPY 0x4035 =20 /** sock_type - Socket types - default values - * * * @SOCK_STREAM - stream (connection) socket * @SOCK_DGRAM - datagram (conn.less) socket @@ -80,18 +86,18 @@ * @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 010000000, - TARGET_SOCK_NONBLOCK =3D 0x40000000, + 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, }; =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_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX - 1. */ =20 #define ARCH_HAS_SOCKET_TYPES 1 diff --git a/linux-user/socket.h b/linux-user/socket.h index 7051cd2cf4..c7e6cb8ea1 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -206,7 +206,7 @@ #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 +#include "hppa/sockbits.h" #else =20 #if defined(TARGET_SPARC) --=20 2.14.1 From nobody Sat Apr 27 16:18:02 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; dkim=fail; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506089102608140.023327460426; Fri, 22 Sep 2017 07:05:02 -0700 (PDT) Received: from localhost ([::1]:59080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvOZa-0007nm-Dh for importer@patchew.org; Fri, 22 Sep 2017 10:04:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvOXq-0006uF-Sy for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvOXo-0001Lz-Gr for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:06 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:38472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvOXo-0001LX-9m for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:04 -0400 Received: by mail-pf0-x241.google.com with SMTP id a7so497467pfj.5 for ; Fri, 22 Sep 2017 07:03:04 -0700 (PDT) Received: from localhost.localdomain (c-73-189-82-67.hsd1.ca.comcast.net. [73.189.82.67]) by smtp.gmail.com with ESMTPSA id d124sm6428901pfc.42.2017.09.22.07.03.01 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Sep 2017 07:03:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lMCNEZAGXmisQl5GGgjAX2AK+RwgWvNAGRFaiHyPHJM=; b=fvBm34BFpnmzaJMWPbmKNzwQFZ8BJKLq23eqaMb8+BJ2lzFjULmfaQmkh8/ADN2D3z +CCweD3dKKSwbkFYE2yoq4l9CK53pri2nSX8MNrt/p6ABDc74uENpw4/gYOrT8Tq1FBw 49HXQnkZcBlSM1HX1hDYcLcfaeC7j8JFaDK4N1VByx5N+fU+RBVABu/2YuP1qVUuCFI1 JSyzLhtrqGdOjiMo3804TiuODHJ0TdjzoDb2moJUYxlu5S5j47zRxOdJ2c8NkyxTuQaq ybzGHRecX8XvwyiOieKjnOnO/NvkfJ4dIhfvUzyujB/rPcywixnYhxrWouTU6Fx584fh o3aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lMCNEZAGXmisQl5GGgjAX2AK+RwgWvNAGRFaiHyPHJM=; b=rOLtRdrnwvp7/4ildVJglWjrTahediqVVoYCfXUUdt1zeMhoLofMltBN+AeQrjPS2E Ji2U9MW8MZTXNebWpdYjTZdcNUNZbv3PxSX6xzzGUEvuG3HXECPYneBoEB6HN++WwaPL 7Qat8eM6BHb4ujgfA/7MRUexpLFytKf9m4EI3GGq5Z9oDJjU3v+nO/eQrdf84FgSXHzp 1ADSXCc+SUF3WLixV7tCjdWAjM2dO8F4aLTnTpfDVyvntqnAmdfE1w+630PipdX4FvlC egnYd/1hEa82AowLh8ztw6sWv3k/LJ3exgqHmuxaBeJkXJF95eCah5zf2FJYkJ9GIn7t JZcw== X-Gm-Message-State: AHPjjUgDWKX0TvgeH9/cmRcMdZXMlaojLg3n95SMraBG1Px5j8cEGlh6 J63wSQti8KJ0qbSbj4pHWLo0OvFz X-Google-Smtp-Source: AOwi7QALFAUDWnVbhRyHQTVxzbfJa9gjdyYcvcdb+bttquuz/x557iRv6vEChBrx1m09BBUPPutfGQ== X-Received: by 10.98.166.72 with SMTP id t69mr5145874pfe.263.1506088983075; Fri, 22 Sep 2017 07:03:03 -0700 (PDT) From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 07:02:33 -0700 Message-Id: <20170922140237.10869-3-carenas@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170922140237.10869-1-carenas@gmail.com> References: <20170922140237.10869-1-carenas@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [RFC 2/6] linux-user: refactor socket.h for alpha 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: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= , riku.voipio@iki.fi, laurent@vivier.eu, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 based on fresh bits from linux 4.14 and therefore enabling SO_REUSEPORT as a side effect Signed-off-by: Carlo Marcelo Arenas Bel=C3=B3n --- linux-user/alpha/sockbits.h | 104 ++++++++++++++++++++++++++++++++++++++++= ++++ linux-user/socket.h | 104 +---------------------------------------= ---- 2 files changed, 105 insertions(+), 103 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..768579a1f7 --- /dev/null +++ b/linux-user/alpha/sockbits.h @@ -0,0 +1,104 @@ +#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 +#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 +#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 +#define TARGET_SO_ATTACH_FILTER 26 +#define TARGET_SO_DETACH_FILTER 27 +#define TARGET_SO_GET_FILTER TARGET_SO_ATTACH_FILTER +#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 +#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 +#define TARGET_SO_NOFCS 43 +#define TARGET_SO_LOCK_FILTER 44 +#define TARGET_SO_SELECT_ERR_QUEUE 45 +#define TARGET_SO_BUSY_POLL 46 +#define TARGET_SO_MAX_PACING_RATE 47 +#define TARGET_SO_BPF_EXTENSIONS 48 +#define TARGET_SO_INCOMING_CPU 49 +#define TARGET_SO_ATTACH_BPF 50 +#define TARGET_SO_DETACH_BPF TARGET_SO_DETACH_FILTER +#define TARGET_SO_ATTACH_REUSEPORT_CBPF 51 +#define TARGET_SO_ATTACH_REUSEPORT_EBPF 52 +#define TARGET_SO_CNX_ADVICE 53 +#define TARGET_SCM_TIMESTAMPING_OPT_STATS 54 +#define TARGET_SO_MEMINFO 55 +#define TARGET_SO_INCOMING_NAPI_ID 56 +#define TARGET_SO_COOKIE 57 +#define TARGET_SCM_TIMESTAMPING_PKTINFO 58 +#define TARGET_SO_PEERGROUPS 59 +#define TARGET_SO_ZEROCOPY 60 + +/** 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_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, + 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 diff --git a/linux-user/socket.h b/linux-user/socket.h index c7e6cb8ea1..115bdf2ddb 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -102,109 +102,7 @@ #define TARGET_SOCK_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX-= 1. */ =20 #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. */ +#include "alpha/sockbits.h" #elif defined(TARGET_HPPA) #include "hppa/sockbits.h" #else --=20 2.14.1 From nobody Sat Apr 27 16:18:02 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) 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 1506089231655732.8604054089303; Fri, 22 Sep 2017 07:07:11 -0700 (PDT) Received: from localhost ([::1]:59091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvObc-0000tM-Is for importer@patchew.org; Fri, 22 Sep 2017 10:07:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53795) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvOXx-0006uk-PU for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvOXq-0001N2-QO for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:13 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:36993) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvOXq-0001Mc-IU for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:06 -0400 Received: by mail-pf0-x244.google.com with SMTP id e69so499337pfg.4 for ; Fri, 22 Sep 2017 07:03:06 -0700 (PDT) Received: from localhost.localdomain (c-73-189-82-67.hsd1.ca.comcast.net. [73.189.82.67]) by smtp.gmail.com with ESMTPSA id d124sm6428901pfc.42.2017.09.22.07.03.03 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Sep 2017 07:03:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9+aqmHi6OSn9QQFJASH1cvYQoI/UsCTlXU04UMH+Cd8=; b=E6sKRAwpMIotWc9YD1vj7kjr6RwBUQ35Fq5idfuLoveHFv0JuRJNm9m5Y2DXHsJjGP NK7zzfR/1CmvJekBADeFazHyiH7X+p8kVwn13SwXIF4gklY6enisl+iEnjgAZyLNjqO2 JVKZn+Sh7Z42M6SQhPUrIMfJDCXt0/BmB0GYr+Sbl/wydbvVlYj2N6D9f3v/JHrXUM7l OrAUtFw+TGClHyFmKkqLfi7F2Oc/2N3FT7Js9YnizjyZVol91NddJ80Bzh4J/jP7W94O pNs0wlTRn5cD4RQP7/4SdYvPoocMiv1Mul7OUzd5PreX6ofFCKPhSOH/1mfwbstAPvUt p84w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9+aqmHi6OSn9QQFJASH1cvYQoI/UsCTlXU04UMH+Cd8=; b=JuWVA0QZ224CcsJcy9ZzX/+TEjZbH6hBItSo6r/wxq88rPApbj0E+CUdG+eO+uHuxX F1WKmNGdkkj8tbr29+lRZ6lxbHguVASoJAnT3MDGhky30LTFmDWlFLf2rK0fdt+FR/W1 VxVGq1pDql699IM/DLRYRWMeWJ7+bjvgLpHIYHiJgxhG+gfliiBR4Gnig2SSJ0MVoJxq 2z4zaLzvD/SIQGwVMr9j6qwvYu4MpBR3NQrYa1nYWannFXIZpU4lFI3J0yAjLZglNjI1 jNL2Hvb91Rr6Y+x3UC0db++2qvrn7xWpbuvF5JzoRoWXSU90Angn6YnUgRb3HRPLBvwd k9Ig== X-Gm-Message-State: AHPjjUiUT5pbKg1tKGEk6vO3Bm7w7d7R+urNsRUx1+gR0pB7ISxMn2cJ l9O0UDJUsJmXf6pHgm5IU/YgZcWU X-Google-Smtp-Source: AOwi7QBN5l0nau/79H5GNQUUoP1MaAqlndTqIYLBw7iS0LoC64ni6RdcYpmTizyyug1tEKzYHmG6nQ== X-Received: by 10.98.11.207 with SMTP id 76mr9430399pfl.187.1506088984959; Fri, 22 Sep 2017 07:03:04 -0700 (PDT) From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 07:02:34 -0700 Message-Id: <20170922140237.10869-4-carenas@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170922140237.10869-1-carenas@gmail.com> References: <20170922140237.10869-1-carenas@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [RFC 3/6] linux-user: refactor socket.h for mips 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: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= , riku.voipio@iki.fi, laurent@vivier.eu, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 fresh bits from linux 4.14, redefine SO_STYLE and {SO,SCM}_TIMESTAMP to the target values and enables SO_REUSEPORT Signed-off-by: Carlo Marcelo Arenas Bel=C3=B3n Reviewed-by: Laurent Vivier --- linux-user/mips/sockbits.h | 107 +++++++++++++++++++++++++++++++++++++++++= ++++ linux-user/socket.h | 103 +----------------------------------------= -- 2 files changed, 108 insertions(+), 102 deletions(-) create mode 100644 linux-user/mips/sockbits.h diff --git a/linux-user/mips/sockbits.h b/linux-user/mips/sockbits.h new file mode 100644 index 0000000000..6d8ea8aba2 --- /dev/null +++ b/linux-user/mips/sockbits.h @@ -0,0 +1,107 @@ +#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. = */ +#define TARGET_SO_REUSEPORT 0x0200 /* Allow local address and port reuse= . */ +#define TARGET_SO_TYPE 0x1008 /* Compatible name for TARGET_SO_STYL= E. */ +#define TARGET_SO_STYLE TARGET_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 +#define TARGET_SO_PROTOCOL 0x1028 /* protocol type */ +#define TARGET_SO_DOMAIN 0x1029 /* domain/socket family */ +#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_SECURITY_AUTHENTICATION 22 +#define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 23 +#define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 24 +#define TARGET_SO_BINDTODEVICE 25 +#define TARGET_SO_ATTACH_FILTER 26 +#define TARGET_SO_DETACH_FILTER 27 +#define TARGET_SO_GET_FILTER TARGET_SO_ATTACH_FILTER +#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_SNDBUFFORCE 31 +#define TARGET_SO_RCVBUFFORCE 33 +#define TARGET_SO_PASSSEC 34 +#define TARGET_SO_TIMESTAMPNS 35 +#define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS +#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 +#define TARGET_SO_NOFCS 43 +#define TARGET_SO_LOCK_FILTER 44 +#define TARGET_SO_SELECT_ERR_QUEUE 45 +#define TARGET_SO_BUSY_POLL 46 +#define TARGET_SO_MAX_PACING_RATE 47 +#define TARGET_SO_BPF_EXTENSIONS 48 +#define TARGET_SO_INCOMING_CPU 49 +#define TARGET_SO_ATTACH_BPF 50 +#define TARGET_SO_DETACH_BPF TARGET_SO_DETACH_FILTER +#define TARGET_SO_ATTACH_REUSEPORT_CBPF 51 +#define TARGET_SO_ATTACH_REUSEPORT_EBPF 52 +#define TARGET_SO_CNX_ADVICE 53 +#define TARGET_SCM_TIMESTAMPING_OPT_STATS 54 +#define TARGET_SO_MEMINFO 55 +#define TARGET_SO_INCOMING_NAPI_ID 56 +#define TARGET_SO_COOKIE 57 +#define TARGET_SCM_TIMESTAMPING_PKTINFO 58 +#define TARGET_SO_PEERGROUPS 59 +#define TARGET_SO_ZEROCOPY 60 + +/** 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. + */ +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 0x0080, +}; + +#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 diff --git a/linux-user/socket.h b/linux-user/socket.h index 115bdf2ddb..036270a6e4 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -1,106 +1,5 @@ - #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. */ - +#include "mips/sockbits.h" #elif defined(TARGET_ALPHA) #include "alpha/sockbits.h" #elif defined(TARGET_HPPA) --=20 2.14.1 From nobody Sat Apr 27 16:18:02 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; dkim=fail; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506089508289464.82922746934923; Fri, 22 Sep 2017 07:11:48 -0700 (PDT) Received: from localhost ([::1]:59121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvOgA-0004uc-2d for importer@patchew.org; Fri, 22 Sep 2017 10:11:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvOXy-0006v0-Ce for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvOXs-0001O9-7y for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:14 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:33578) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvOXs-0001NZ-0t for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:08 -0400 Received: by mail-pg0-x242.google.com with SMTP id i130so703727pgc.0 for ; Fri, 22 Sep 2017 07:03:07 -0700 (PDT) Received: from localhost.localdomain (c-73-189-82-67.hsd1.ca.comcast.net. [73.189.82.67]) by smtp.gmail.com with ESMTPSA id d124sm6428901pfc.42.2017.09.22.07.03.05 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Sep 2017 07:03:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1v/TZzFeo4r7OuGEBFT2EB7IzYI2Uck0JhIK4bTTzGk=; b=CiJ2USMMw32FxeinqrYSe6sC7paJEno8MnMUK4cEBRSl1GWw6SxDPFX1EqiJBfS5PG v999WqgSid/NlymcosdWgHv728S0QFzMuw/MPwOfWcAUNq1ll3/wdU2+ipCDI/kE66IT 5dJfuZGyT05pjbcQL4v2TVkDNdcwEGjagwJPdBosX0XWILur2g5WGF8RcIaRkfCbr09S NfJVZBHT0DTr6l0s/qV68WjQUH1FhvJ3tFZ2FoCQyEEz4VZoshSlt36Xt6f1qpcGfuDp fkN1CbUHozjZ+9wLcanRlgSCsDNm5fDVH7XerM5j3dhksla4phc/np48KkZAIhqv6hU9 XVQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1v/TZzFeo4r7OuGEBFT2EB7IzYI2Uck0JhIK4bTTzGk=; b=X+Jj2ftM7jABkCvJWoj/kfnyY0DruX6FyXhw7wVCx787T7r3YqC03n+kqMvID4/C0A RM+YfPxFCoA0XPBHHKzBQoJ+lMOT6dBiViWJHJdwMGhZlKmjMwrgTFeAzIDCQN1CFrc8 80Y++abLBOj+BGYdSEuRhhl8TgEdoqMjUtaOk4bHApSe8foEsdtt4OLAb/O6+bxq75ww qYCH3ZLK4Ap/qPS6d3XypmvCgAMX0Ch/V628fyyxeLpBlbs60on3JOvGcUxpK7vGvmPa Z8m0ZITD+wry06ufk1bek1+8CVEvZREO4YtmOfELR3VMmNpqdhRVkJAS9buKnOupKJQ3 8qiQ== X-Gm-Message-State: AHPjjUiwo97kPIyjrXWKEEBivS6jDQMmrPJg4fEQw+pRkDTyuc6RP63T z56ZIFPhHOAbcouidJkdGqURqbyO X-Google-Smtp-Source: AOwi7QBQgGQkBtFAzPdpQ7LDeaYctWy30IrPlqaiRZULBHvRY4EMhLOPgKIZqX2FB/smZESLWww65g== X-Received: by 10.98.79.23 with SMTP id d23mr9494421pfb.105.1506088986712; Fri, 22 Sep 2017 07:03:06 -0700 (PDT) From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 07:02:35 -0700 Message-Id: <20170922140237.10869-5-carenas@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170922140237.10869-1-carenas@gmail.com> References: <20170922140237.10869-1-carenas@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [RFC 4/6] linux-user: refactor socket.h for sparc 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: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= , riku.voipio@iki.fi, laurent@vivier.eu, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 fixes SOL_SOCKET and SO_LINGER at least Signed-off-by: Carlo Marcelo Arenas Bel=C3=B3n Reviewed-by: Laurent Vivier --- linux-user/socket.h | 46 ++------------------ linux-user/sparc/sockbits.h | 104 ++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 107 insertions(+), 43 deletions(-) create mode 100644 linux-user/sparc/sockbits.h diff --git a/linux-user/socket.h b/linux-user/socket.h index 036270a6e4..dfa692286b 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -4,50 +4,10 @@ #include "alpha/sockbits.h" #elif defined(TARGET_HPPA) #include "hppa/sockbits.h" +#elif defined(TARGET_SPARC) +#include "sparc/sockbits.h" #else =20 -#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 - /* For setsockopt(2) */ #define TARGET_SOL_SOCKET 1 =20 @@ -103,11 +63,11 @@ =20 #define TARGET_SO_PEERSEC 31 =20 + #define TARGET_SO_PASSSEC 34 #endif =20 #ifndef ARCH_HAS_SOCKET_TYPES /** sock_type - Socket types - default values - * * * @SOCK_STREAM - stream (connection) socket * @SOCK_DGRAM - datagram (conn.less) socket diff --git a/linux-user/sparc/sockbits.h b/linux-user/sparc/sockbits.h new file mode 100644 index 0000000000..d51ae5f84f --- /dev/null +++ b/linux-user/sparc/sockbits.h @@ -0,0 +1,104 @@ +#define TARGET_SOL_SOCKET 0xffff + +#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 +#define TARGET_SO_NO_CHECK 0x000b +#define TARGET_SO_PRIORITY 0x000c +#define TARGET_SO_BINDTODEVICE 0x000d +#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 0x001c +#define TARGET_SO_TIMESTAMP 0x001d +#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP +#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 +#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_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 +#define TARGET_SO_SECURITY_AUTHENTICATION 0x5001 +#define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002 +#define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 0x5004 + +/** 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_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, + TARGET_SOCK_CLOEXEC =3D 0x400000, + TARGET_SOCK_NONBLOCK =3D 0x4000, +}; + +#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 --=20 2.14.1 From nobody Sat Apr 27 16:18:02 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; dkim=fail; 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 1506089369662174.36045347080335; Fri, 22 Sep 2017 07:09:29 -0700 (PDT) Received: from localhost ([::1]:59102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvOds-0002f4-9M for importer@patchew.org; Fri, 22 Sep 2017 10:09:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvOXz-0006wH-IH for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvOXt-0001PH-Nc for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:15 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:36994) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvOXt-0001Oi-Ig for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:09 -0400 Received: by mail-pf0-x243.google.com with SMTP id e69so499384pfg.4 for ; Fri, 22 Sep 2017 07:03:09 -0700 (PDT) Received: from localhost.localdomain (c-73-189-82-67.hsd1.ca.comcast.net. [73.189.82.67]) by smtp.gmail.com with ESMTPSA id d124sm6428901pfc.42.2017.09.22.07.03.06 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Sep 2017 07:03:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GUsWnpLgE34ENDTqipyUlZE4urQAH3WBMJDBfWADGF0=; b=iyo9BJNTaxgGEaXf9EsMaxFPdGoHacMRCn5OoJYHYymavhO6PU9InMy8WaXZ9kLffD qU3u4Z3iAAv1TI7c3yoko/VBmc6bC6ZQSZM2F4WH+OYYu5+q63eKRpC4TlcK7Vy7yJhC IOyIdsVa5yPl/pFS6lbr5WbV/fiEB/laqc7QocpKM/dOztqFZjxlBX9coyYRqLJP8XAE TBSKHfrioIcZI8tLPYhWe7wBQ+8IYPIymCLRHs5bNsbzyKlygO9IB0OMOxLazn7ix87m wgQTwI3g9gyoBQLWNRmvMGtBk9Mhy+Ti12IxZStUmUaOAJ9+62AszCdI4hLZN9BXWGBK suwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GUsWnpLgE34ENDTqipyUlZE4urQAH3WBMJDBfWADGF0=; b=gSSFwHXzmC1CqrqmOiyTyJexKOCbT9ygf7kqJPn7scSpDh+w/6wxwPS+Eu41FrbrDu JoTmHUra0peDis/OqhRXbDVEn6L3QRcaqO2zE2EiIRvee9YHZKC8ufuX0E8S6guZ8A+z 1x2Wsd8i2MmOMq54aHtPJ7EvOr3qtlnKvxZpvShSV/OdeWCmrUbJJvL6cvDkhlikqkas GBG5D8IyZZQhI72vNAF0Wo/ZCv+gsn4n2TXx7XbriIjxqbrKj7DbfjsgVZuMfpE1GCff 8u2BcKKMpQ1emh8DJsuhDZVYOSb24lETIBLbY6ZMeYo4jieMTQLFFauKQQ6L4K9Hb4ZU 2I/g== X-Gm-Message-State: AHPjjUjyj04fSCvn0zOVHzDXz/DlOmDZk6DucqCpyZX/ORKN8Q4+FLor F7WooGiwmomt/nvtL7CLznsuPtZe X-Google-Smtp-Source: AOwi7QAQiDyqhfCnC8X63E+IizpGH+qBPt31vbKAlUnSakilxA+KQC0jqGgy/Zrz5QZJ6V7yI/YrqA== X-Received: by 10.98.89.91 with SMTP id n88mr9475314pfb.280.1506088988407; Fri, 22 Sep 2017 07:03:08 -0700 (PDT) From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 07:02:36 -0700 Message-Id: <20170922140237.10869-6-carenas@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170922140237.10869-1-carenas@gmail.com> References: <20170922140237.10869-1-carenas@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [RFC 5/6] linux-user: fix 64bit versions of sparc and mips 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: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= , riku.voipio@iki.fi, laurent@vivier.eu, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Carlo Marcelo Arenas Bel=C3=B3n --- linux-user/mips64/sockbits.h | 1 + linux-user/socket.h | 4 ++-- linux-user/sparc64/sockbits.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 linux-user/mips64/sockbits.h create mode 100644 linux-user/sparc64/sockbits.h 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 dfa692286b..6fd486c6b1 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -1,10 +1,10 @@ -#if defined(TARGET_MIPS) +#if defined(TARGET_MIPS) || defined(TARGET_MIPS64) #include "mips/sockbits.h" #elif defined(TARGET_ALPHA) #include "alpha/sockbits.h" #elif defined(TARGET_HPPA) #include "hppa/sockbits.h" -#elif defined(TARGET_SPARC) +#elif defined(TARGET_SPARC) || defined(TARGET_SPARC64) #include "sparc/sockbits.h" #else =20 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.1 From nobody Sat Apr 27 16:18:02 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) 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 150608963937463.721973824371275; Fri, 22 Sep 2017 07:13:59 -0700 (PDT) Received: from localhost ([::1]:59130 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvOi9-00071F-Aj for importer@patchew.org; Fri, 22 Sep 2017 10:13:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvOY1-0006xr-G5 for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvOXv-0001Q4-SF for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:17 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:33963) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvOXv-0001Ps-Lz for qemu-devel@nongnu.org; Fri, 22 Sep 2017 10:03:11 -0400 Received: by mail-pg0-x241.google.com with SMTP id u18so702425pgo.1 for ; Fri, 22 Sep 2017 07:03:11 -0700 (PDT) Received: from localhost.localdomain (c-73-189-82-67.hsd1.ca.comcast.net. [73.189.82.67]) by smtp.gmail.com with ESMTPSA id d124sm6428901pfc.42.2017.09.22.07.03.08 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Sep 2017 07:03:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dVdyMx2v5ej7QMB1IGgqrkyFX+AEaJpD34TrfGs89U4=; b=nqLHOCAkltthqbz8/WEPi3KCegFhISOJuDAmMfluc0IMviVXQcQi3oaDIVYCWX0ugg J5cSXAsSCBS5/5N8Kpa6mcIFLEqHdaXG3Y2zVzL83getx0dsuOMZwBrxNGOiT9TmZOdL h0YefHttPpc9lFi1RMg2dJf6bfhMT9EUgQ5uRaSXaLRqZqta89e5sSugLkkiIGfFgQg9 Vuok0RJ/xwgFpgDZ1rri3E34AX0lL1x8ekdLW3lUpV8YDQBB0Iz3th1rrGY+quddFOpj dIMLoRRMTaE0/vLphR/Rq2pQHUjJ8UyoSg43Z9O0E2ZltCKMPKMz89bnxCh7iymKecID o+pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dVdyMx2v5ej7QMB1IGgqrkyFX+AEaJpD34TrfGs89U4=; b=VIhcOSk6aq5Skl46V18Id/+284DLZNlyz5h5htnFgs3Q+MeAs3vRB9TK+u22areReZ FG5u24Y7hzoMgsNqfkKQNjKr3KESZXV8U82Q4ERC1IDpkiGDT9N264TLUCPLVG8XOTFS 5G/is5v6gwxoQ669iYrCuEppxjLj2zloW/uywm/HbXDeky93v01+zaXglGeAGipiVnq8 dvG4KD98j6EbjIrmMuLbryAIzEMqhPg4hstDv6CbQInEB4/QBJWMejqBOQK0NTtEsHrF TwD3igR1CDZtiHAG6zVhA6/UFilV+JBPR7k0WcznTkI9iz2Fjvo7n3vfrnuxqfuanzXK QAnQ== X-Gm-Message-State: AHPjjUjgeCBypwK7GxD8lvmEc+UvrEPc2o42dsikWHQ+jxaK2kbxs5I8 hrSI58iJR/MkZtHbYodUkffKWt5l X-Google-Smtp-Source: AOwi7QC5F5LhoYBRjGASeql9US+osOEHLBxeLJaFifV+d175TeYlzhGwNaeZL1vm1cvsJg36XS06sg== X-Received: by 10.98.33.80 with SMTP id h77mr9571792pfh.18.1506088990196; Fri, 22 Sep 2017 07:03:10 -0700 (PDT) From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 07:02:37 -0700 Message-Id: <20170922140237.10869-7-carenas@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170922140237.10869-1-carenas@gmail.com> References: <20170922140237.10869-1-carenas@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [RFC 6/6] linux-user: update default socket.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: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= , riku.voipio@iki.fi, laurent@vivier.eu, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 * enable SO_REUSEPORT as a sideeffect and add SO_GET_FILTER alias * make sure 64bit version for ppc is also supported Signed-off-by: Carlo Marcelo Arenas Bel=C3=B3n --- linux-user/socket.h | 61 ++++++++++++++++++++++++++++++++++++++++++-------= ---- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/linux-user/socket.h b/linux-user/socket.h index 6fd486c6b1..c37c10822a 100644 --- a/linux-user/socket.h +++ b/linux-user/socket.h @@ -27,8 +27,8 @@ #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_REUSEPORT 15 +#if defined(TARGET_PPC) || defined(TARGET_PPC64) #define TARGET_SO_RCVLOWAT 16 #define TARGET_SO_SNDLOWAT 17 #define TARGET_SO_RCVTIMEO 18 @@ -49,21 +49,58 @@ #define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 23 #define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 24 =20 - #define TARGET_SO_BINDTODEVICE 25 + #define TARGET_SO_BINDTODEVICE 25 =20 /* Socket filtering */ - #define TARGET_SO_ATTACH_FILTER 26 - #define TARGET_SO_DETACH_FILTER 27 + #define TARGET_SO_ATTACH_FILTER 26 + #define TARGET_SO_DETACH_FILTER 27 + #define TARGET_SO_GET_FILTER TARGET_SO_ATTACH_FILTER =20 - #define TARGET_SO_PEERNAME 28 - #define TARGET_SO_TIMESTAMP 29 - #define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP + #define TARGET_SO_PEERNAME 28 + #define TARGET_SO_TIMESTAMP 29 + #define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP =20 - #define TARGET_SO_ACCEPTCONN 30 + #define TARGET_SO_ACCEPTCONN 30 =20 - #define TARGET_SO_PEERSEC 31 + #define TARGET_SO_PEERSEC 31 + #define TARGET_SO_PASSSEC 34 + #define TARGET_SO_TIMESTAMPNS 35 + #define TARGET_SCM_TIMESTAMPNS TARGET_SO_TIMESTAMPNS + + #define TARGET_SO_MARK 36 + + #define TARGET_SO_TIMESTAMPING 37 + #define TARGET_SCM_TIMESTAMPING TARGET_SO_TIMESTAMPING + + #define TARGET_SO_PROTOCOL 38 + #define TARGET_SO_DOMAIN 39 + + #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 + + #define TARGET_SO_NOFCS 43 + #define TARGET_SO_LOCK_FILTER 44 + #define TARGET_SO_SELECT_ERR_QUEUE 45 + #define TARGET_SO_BUSY_POLL 46 + #define TARGET_SO_MAX_PACING_RATE 47 + #define TARGET_SO_BPF_EXTENSIONS 48 + #define TARGET_SO_INCOMING_CPU 49 + #define TARGET_SO_ATTACH_BPF 50 + #define TARGET_SO_DETACH_BPF TARGET_SO_DETACH_FILTER + #define TARGET_SO_ATTACH_REUSEPORT_CBPF 51 + #define TARGET_SO_ATTACH_REUSEPORT_EBPF 52 + #define TARGET_SO_CNX_ADVICE 53 + #define TARGET_SCM_TIMESTAMPING_OPT_STATS 54 + #define TARGET_SO_MEMINFO 55 + #define TARGET_SO_INCOMING_NAPI_ID 56 + #define TARGET_SO_COOKIE 57 + #define TARGET_SCM_TIMESTAMPING_PKTINFO 58 + #define TARGET_SO_PEERGROUPS 59 + #define TARGET_SO_ZEROCOPY 60 =20 - #define TARGET_SO_PASSSEC 34 #endif =20 #ifndef ARCH_HAS_SOCKET_TYPES @@ -94,6 +131,6 @@ }; =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_TYPE_MASK 0xf /* Covers up to TARGET_SOCK_MAX - = 1. */ =20 #endif --=20 2.14.1