From patchwork Mon Feb 15 12:45:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 382953 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp1051083jao; Mon, 15 Feb 2021 04:56:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJxobpDudKP/Uq1S3a6M7XXaz/4nrdYYBhb/FG07fAhNkk6JSzJaOoE6qv+eANGxxfr2fBvo X-Received: by 2002:a25:83cc:: with SMTP id v12mr22211085ybm.293.1613393766063; Mon, 15 Feb 2021 04:56:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613393766; cv=none; d=google.com; s=arc-20160816; b=XxUOXMSAZJ8T8E4iXPqOJlteSEs+geR9Gez4wkzLKjnsBWToGG68413EeDKCE8gTBJ pNeJMG13QmhSnOvpCm759KIkO2rkop4D6b1BDnz2mV2FTWQddAqM9qzFdemfvS3B9nTX FuO3OcBdg7EdPdHIWRp8u6M9gKCw5TdR2OKCOevBQXg63yYdKuuYdBLOs6Zjc7g8KuNU y7uFkWenxBt7pIehCmjP/f64BDGAzdL4zl6hWR6j387rDzqYQVK/XaLofEqCITgSDP/c FbQJsBSS6n8Xproe0wt0VRngn6xZNBOYTToYDnQZnSjhCpcexn8h+yQKAEuDzGsCYLEA xgKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=6RK+Cmr4vg7QI0iVuWuMnA+k6lf8QwJ2oMoWfevqQJE=; b=OvcMYgrF92QTB/fCKibHRtHBt6JEkxZMBbaxBO7Z13hv8tixi5zLKvtk5uB7rxWmye SCdRWTFiqyk2QS8aVyCwM6NnTAc5D2NmfHUjIhsSu7brGJEU+Nj59batTQy3En82Qnvw ZTCW+wLZy/selBEFq8BOW+YSG5GLcpTpn3v0aYUevkuXsAQ7v7nFG+fGR8OzZUkexBQl b7tSo46AFRALQAZwbYWDBEdmn2GLh8K5N74OEnLXZpSi0grT0G9kmItUu4OYH2xYoMF/ n4wHA/aNM8oVArzgZoRfc4eXSv/WsWcd2luVVz9qjkIVIMUJKY+dYkJG76LNBGR6MLWb jlJg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f34si10972326ybj.252.2021.02.15.04.56.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Feb 2021 04:56:06 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:42974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBdQ5-0005oo-Gw for patch@linaro.org; Mon, 15 Feb 2021 07:56:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBdFu-00046m-Oj for qemu-devel@nongnu.org; Mon, 15 Feb 2021 07:45:35 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:45939) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBdFs-0000h7-9V for qemu-devel@nongnu.org; Mon, 15 Feb 2021 07:45:34 -0500 Received: from localhost.localdomain ([82.252.134.158]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M7JrG-1lEw712H7s-007ilw; Mon, 15 Feb 2021 13:45:27 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 10/13] linux-user: add TARGET_SO_{DOMAIN,PROTOCOL} Date: Mon, 15 Feb 2021 13:45:16 +0100 Message-Id: <20210215124519.720265-11-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210215124519.720265-1-laurent@vivier.eu> References: <20210215124519.720265-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:GwU5AIfnjXwqiQnRUu01L9zbf2sUn+yNm7ljvRd5+3JegSBRu1q kZ9fP5PTTi0LaCnGuPdqlMVxjacTTvW3+HxKhaRomC4Cn/7h/kETQhDDBjZP7x2hfomLzZQ 7ztt6slPiAZaNx6pPfIi4G98utRGSk1vLgWHOp5Okz7jNd5hB4OICiU7PYYAeM1cfqcqw1v lANe+k8MqaSwqaiQ098Vg== X-UI-Out-Filterresults: notjunk:1; V03:K0:LgA0ZQtHN1M=:66bebjpOYbFqkW3svWk1tw Q4NFRcy0T8OHt3z2kINiWER1R/Y9ui8IOAPCm946eWhb0+XvAlDNSl2bG58E4oOVZHGHUgff3 y0cXcyn+NZakUv+KkA8dJg7przAkhbwOywiFxCCvQI2miuC8525BvvygM9vMIn7RCOxF06on4 w9J9H/NSm49Qru2EPg3lvDQrwg1h+mu2w8l9XzzyNw3Eicrp4eE/WtGQObKWuX35xCWbj3ZBn kAEXS18s3RwRkEF6Q26welt3KF3b9mmtV0LZhWsFaRSErCZlw3v3lLaj9Bu+89nfxGlX3s8Is P2HWsiPuEOFVf6/f7kp3SR1MWqqSmF7DM/uV/ux3Shq3YN/B42PNApNwBwJXpDd0zQ9myPEV8 Ma8whs8jIWBGW5bniOZ8F7cW32XjyZJdH+AxNwSOjOLZjwBOIzxNnS30vJXQOkrz+Ir12fEoZ XE5KZclU6w== Received-SPF: none client-ip=217.72.192.74; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Jason A. Donenfeld" , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Jason A. Donenfeld" These were defined for other platforms but mistakenly left out of mips and generic, so this commit adds them to the places missing. Then it makes them be translated in getsockopt. Signed-off-by: Jason A. Donenfeld Reviewed-by: Laurent Vivier Message-Id: <20210204153925.2030606-1-Jason@zx2c4.com> Signed-off-by: Laurent Vivier --- linux-user/generic/sockbits.h | 3 +++ linux-user/mips/sockbits.h | 2 ++ linux-user/syscall.c | 6 ++++++ 3 files changed, 11 insertions(+) -- 2.29.2 diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h index e44733c601a4..b3b4a8e44c6d 100644 --- a/linux-user/generic/sockbits.h +++ b/linux-user/generic/sockbits.h @@ -55,4 +55,7 @@ #define TARGET_SO_ACCEPTCONN 30 #define TARGET_SO_PEERSEC 31 + +#define TARGET_SO_PROTOCOL 38 +#define TARGET_SO_DOMAIN 39 #endif diff --git a/linux-user/mips/sockbits.h b/linux-user/mips/sockbits.h index 0f022cd598a9..562cad88e2f8 100644 --- a/linux-user/mips/sockbits.h +++ b/linux-user/mips/sockbits.h @@ -40,6 +40,8 @@ #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 */ /* linux-specific, might as well be the same as on i386 */ #define TARGET_SO_NO_CHECK 11 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 6fea00869e6b..36b090105522 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2837,6 +2837,12 @@ get_timeout: case TARGET_SO_ACCEPTCONN: optname = SO_ACCEPTCONN; goto int_case; + case TARGET_SO_PROTOCOL: + optname = SO_PROTOCOL; + goto int_case; + case TARGET_SO_DOMAIN: + optname = SO_DOMAIN; + goto int_case; default: goto int_case; }