From nobody Tue Nov 18 07:46:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1608320033; cv=none; d=zohomail.com; s=zohoarc; b=aaxopZLX5rjLmk0d3f81m2VCunFw+2SIQoZMI4y3MKQ0ZZQPFvDwNtmAl4Z1AM1VoowqnLFSgTXojL/B8egAMM97muhZaXhOUK7PUFsv88KD1Pn1IBZdFZcnNsp7BQY/f7uWWpf459T/qcMJ2AINNcksKaKUpaKxzDK9zHjeafk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608320033; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=mUF/I10tWDEHKh5BtkBg2/H9yhWwQ0Xr0kzGwGeVD8c=; b=Y2soT5iuzDhiZwlQt/iuIxrfhPE5p3cFdEXvC9jZge08cKTUQKZfiBIucMU0GsBCbDb2lFMDhT4JYIg8+VPUL3vet6QiiMsAOtd1s2rXKcTMJDSJZqbABHYJZsXRVzKWjyP/Y9CZ6MBmj8qWgDL0L4+R1H2NLexez5d2DoVr0iM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608320033598498.50863179280884; Fri, 18 Dec 2020 11:33:53 -0800 (PST) Received: from localhost ([::1]:55126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqLVg-0007ym-8q for importer@patchew.org; Fri, 18 Dec 2020 14:33:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3wwPdXwMKCkQyi2muumrk.iuswks0-jk1krtutmt0.uxm@flex--scw.bounces.google.com>) id 1kqLUF-0006jE-0z for qemu-devel@nongnu.org; Fri, 18 Dec 2020 14:32:23 -0500 Received: from mail-qt1-x84a.google.com ([2607:f8b0:4864:20::84a]:49134) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3wwPdXwMKCkQyi2muumrk.iuswks0-jk1krtutmt0.uxm@flex--scw.bounces.google.com>) id 1kqLUD-0007ty-8q for qemu-devel@nongnu.org; Fri, 18 Dec 2020 14:32:22 -0500 Received: by mail-qt1-x84a.google.com with SMTP id l7so2403872qth.15 for ; Fri, 18 Dec 2020 11:32:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=mUF/I10tWDEHKh5BtkBg2/H9yhWwQ0Xr0kzGwGeVD8c=; b=PtZOWJQ+RybW6ZnJ4QHKX1lVtjbQF2Wf9hrLG0IhmxZQfP6Mr2C1UwdaY0wQLyh2D5 KlhqU0D777C2GLwU1k2Mlipmu9FysrS6kcsAhag4H2PtNbSIADgbieq+CzdSSCc8GfaC nCr8BEC7JvgAjWE6LAGDVD7ljT7OX6Iye5qonuFTC56ZWIW5bxi71Z/AFjR4tUzNiT3Y mneRjf4Lyy93llO9Ja7Pie2RbA6x+K9IDuTRxxivwTMVOVXgOf1h94rlQqP2TnjU8N1J CJjAlEuhkToIurnCbguBLoUdLFmecwthMks7G4B8b5PgnYjKpjwct5uJh77mpPTC/W4D La4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=mUF/I10tWDEHKh5BtkBg2/H9yhWwQ0Xr0kzGwGeVD8c=; b=gv5CDb7MCZvb4j+BQplMKwBingiN2AEToTe+yJThC8sYY7BQzb3EmPI+c7pBSVnZPx WJJp8QrrvTkjELpj4JkGR8ms/C0ikvSi+9CuM1klljW68byzCulnikbeRyvQ/E90u2We PepKusJrjD26UpErItOCBHFk1YNwqjmrF+46luR+of5G4/F4IcYXcKZtaEKBiNWl3i6Y Ch6zb9B6q73+YMb0gZHSGbvFi7Hkji4xRrB96mf/9ssvjyubf2VNJgcOgp605U4+Vs63 lF+pwzFGFYXVbJ8jq5DAGguwIwHkVuBXQIZe2R3Qsb4/e8LzSdmKgUHmVY7n1My5crYu JXQg== X-Gm-Message-State: AOAM531Tny5XsHZiGa8PEKeQ4aL8Yz6aiQpkBlRtYQ42vHFe9FPsFvHL nsz2ScdsogwnJXaMBveklsvY65+4afTWOruzOZnGX3ClG+G0+JLzeSiymaERBV3ScdrvAjQVy7i WQZdW2OlTHn/rn524KfozVdyxIY2+VCMMCoNG6oxJpq8BaS7rKAY2 X-Google-Smtp-Source: ABdhPJy/NPrmrCjWTFDlvtdRAgemLY0H/cRoWsxoOnF4bVFQwpotuiv4vYScFJk6Ks3ZIRZB/ukD05E= X-Received: from scw-glinux.svl.corp.google.com ([2620:15c:2ce:200:f693:9fff:fef4:29b5]) (user=scw job=sendgmr) by 2002:a0c:bec6:: with SMTP id f6mr6155475qvj.9.1608319939641; Fri, 18 Dec 2020 11:32:19 -0800 (PST) Date: Fri, 18 Dec 2020 11:32:10 -0800 In-Reply-To: <20201218193213.3566856-1-scw@google.com> Message-Id: <20201218193213.3566856-2-scw@google.com> Mime-Version: 1.0 References: <20201218193213.3566856-1-scw@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH v3 1/4] linux-user: Support F_ADD_SEALS and F_GET_SEALS fcntls To: qemu-devel@nongnu.org, laurent@vivier.eu Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::84a; envelope-from=3wwPdXwMKCkQyi2muumrk.iuswks0-jk1krtutmt0.uxm@flex--scw.bounces.google.com; helo=mail-qt1-x84a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 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: Shu-Chun Weng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Shu-Chun Weng From: Shu-Chun Weng via X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Also reorder blocks so that they are all in the same order everywhere. Signed-off-by: Shu-Chun Weng Reviewed-by: Laurent Vivier --- v1 -> v2: Updated print_fcntl(). v2 -> v3: Rebase to master on Dec 18, 2020 linux-user/strace.c | 39 ++++++++++++++++++++++++++++++++------- linux-user/syscall.c | 10 ++++++++++ linux-user/syscall_defs.h | 14 ++++++++------ 3 files changed, 50 insertions(+), 13 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index e00275fcb5..227812c07e 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -2066,11 +2066,34 @@ print_fcntl(void *cpu_env, const struct syscallname= *name, break; case TARGET_F_SETLEASE: qemu_log("F_SETLEASE,"); - print_raw_param(TARGET_ABI_FMT_ld, arg2, 0); + print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); break; case TARGET_F_GETLEASE: qemu_log("F_GETLEASE"); break; +#ifdef F_DUPFD_CLOEXEC + case TARGET_F_DUPFD_CLOEXEC: + qemu_log("F_DUPFD_CLOEXEC,"); + print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); + break; +#endif + case TARGET_F_NOTIFY: + qemu_log("F_NOTIFY,"); + print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); + break; +#ifdef F_GETOWN_EX + case TARGET_F_GETOWN_EX: + qemu_log("F_GETOWN_EX,"); + print_pointer(arg2, 1); + break; +#endif +#ifdef F_SETOWN_EX + case TARGET_F_SETOWN_EX: + qemu_log("F_SETOWN_EX,"); + print_pointer(arg2, 1); + break; +#endif +#ifdef F_SETPIPE_SZ case TARGET_F_SETPIPE_SZ: qemu_log("F_SETPIPE_SZ,"); print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); @@ -2078,14 +2101,16 @@ print_fcntl(void *cpu_env, const struct syscallname= *name, case TARGET_F_GETPIPE_SZ: qemu_log("F_GETPIPE_SZ"); break; - case TARGET_F_DUPFD_CLOEXEC: - qemu_log("F_DUPFD_CLOEXEC,"); - print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); +#endif +#ifdef F_ADD_SEALS + case TARGET_F_ADD_SEALS: + qemu_log("F_ADD_SEALS,"); + print_raw_param("0x"TARGET_ABI_FMT_lx, arg2, 1); break; - case TARGET_F_NOTIFY: - qemu_log("F_NOTIFY,"); - print_raw_param(TARGET_ABI_FMT_ld, arg2, 0); + case TARGET_F_GET_SEALS: + qemu_log("F_GET_SEALS"); break; +#endif default: print_raw_param(TARGET_ABI_FMT_ld, arg1, 0); print_pointer(arg2, 1); diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 7bf99beb18..be39cf8215 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6596,6 +6596,14 @@ static int target_to_host_fcntl_cmd(int cmd) case TARGET_F_GETPIPE_SZ: ret =3D F_GETPIPE_SZ; break; +#endif +#ifdef F_ADD_SEALS + case TARGET_F_ADD_SEALS: + ret =3D F_ADD_SEALS; + break; + case TARGET_F_GET_SEALS: + ret =3D F_GET_SEALS; + break; #endif default: ret =3D -TARGET_EINVAL; @@ -6888,6 +6896,8 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong a= rg) case TARGET_F_GETLEASE: case TARGET_F_SETPIPE_SZ: case TARGET_F_GETPIPE_SZ: + case TARGET_F_ADD_SEALS: + case TARGET_F_GET_SEALS: ret =3D get_errno(safe_fcntl(fd, host_cmd, arg)); break; =20 diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index b934d0b606..1beaa71d37 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -2376,12 +2376,14 @@ struct target_statfs64 { #endif =20 #define TARGET_F_LINUX_SPECIFIC_BASE 1024 -#define TARGET_F_SETLEASE (TARGET_F_LINUX_SPECIFIC_BASE + 0) -#define TARGET_F_GETLEASE (TARGET_F_LINUX_SPECIFIC_BASE + 1) -#define TARGET_F_DUPFD_CLOEXEC (TARGET_F_LINUX_SPECIFIC_BASE + 6) -#define TARGET_F_SETPIPE_SZ (TARGET_F_LINUX_SPECIFIC_BASE + 7) -#define TARGET_F_GETPIPE_SZ (TARGET_F_LINUX_SPECIFIC_BASE + 8) -#define TARGET_F_NOTIFY (TARGET_F_LINUX_SPECIFIC_BASE+2) +#define TARGET_F_SETLEASE (TARGET_F_LINUX_SPECIFIC_BASE + 0) +#define TARGET_F_GETLEASE (TARGET_F_LINUX_SPECIFIC_BASE + 1) +#define TARGET_F_DUPFD_CLOEXEC (TARGET_F_LINUX_SPECIFIC_BASE + 6) +#define TARGET_F_NOTIFY (TARGET_F_LINUX_SPECIFIC_BASE + 2) +#define TARGET_F_SETPIPE_SZ (TARGET_F_LINUX_SPECIFIC_BASE + 7) +#define TARGET_F_GETPIPE_SZ (TARGET_F_LINUX_SPECIFIC_BASE + 8) +#define TARGET_F_ADD_SEALS (TARGET_F_LINUX_SPECIFIC_BASE + 9) +#define TARGET_F_GET_SEALS (TARGET_F_LINUX_SPECIFIC_BASE + 10) =20 #include "target_fcntl.h" =20 --=20 2.29.2.684.gfbc64c5ab5-goog From nobody Tue Nov 18 07:46:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1608320038; cv=none; d=zohomail.com; s=zohoarc; b=e3SWFCDYoSPY/d9ezJHRgELnX14Z9PQTBjr9nUZd+AluVXBXm2eJRAy2WRqA7xE6r8RSKXCRIyXPz4wx9rDd4SaAmCdO7NlE4F/wSAfd+OtUIilBbE6LXagGTV/AdDVYWQUN/+bPRIXIW5Z2npAYgKDSQL2l5+V8KHt6lynZvKw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608320038; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=1tMnHV/4/e4q+MAB0WmRon6EU9Fl6zVw62+wbVTIBM4=; b=BjPpq4C6YDcl3Y2UowxPyUFSPVjf+j0NOopSkayltDTXDjjJx3zyiWYWiYiyAYDMFSmIt/1OxzfiRB/+xOyUQaVn8AfgcijVioe4ijf1s2xk408D9pQYU2RAcyysYx5L/+uWhDfBygeHgzC32r60i0cb6vNgf5/M3z6sXW7gmyM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608320037829301.4504996776151; Fri, 18 Dec 2020 11:33:57 -0800 (PST) Received: from localhost ([::1]:55202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqLVg-00080c-Lx for importer@patchew.org; Fri, 18 Dec 2020 14:33:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3xQPdXwMKCkY0k4owwotm.kwuymu2-lm3mtvwvov2.wzo@flex--scw.bounces.google.com>) id 1kqLUL-0006l0-UR for qemu-devel@nongnu.org; Fri, 18 Dec 2020 14:32:30 -0500 Received: from mail-pg1-x549.google.com ([2607:f8b0:4864:20::549]:42338) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3xQPdXwMKCkY0k4owwotm.kwuymu2-lm3mtvwvov2.wzo@flex--scw.bounces.google.com>) id 1kqLUG-0007uU-Am for qemu-devel@nongnu.org; Fri, 18 Dec 2020 14:32:29 -0500 Received: by mail-pg1-x549.google.com with SMTP id f3so2285410pgg.9 for ; Fri, 18 Dec 2020 11:32:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=1tMnHV/4/e4q+MAB0WmRon6EU9Fl6zVw62+wbVTIBM4=; b=G3q7e82FaBO4ZGk1Rkfvbr4yEbc62tlB5L8iD3j9TcWf2YFFkVnd3m79Gk0p726yY0 MyMVFB4/fPxAxCDyTEtTNyj7aLI66jc/1e4NQKWXhtQup0uv+T+/Dn+DiJHIwAL/+Z3k IBplI4aKVmU9RPuo0rVS+saS9ahgrLIB3zJi/NbT6MuABD9dJ/lZCe94yBcB+SYpkdJG aB5h7LLeqT+1VcArqXHaEVsUvjAnbeBO1+Onlup2XL4wcnECN03eUVNgQauSDpmYR0ns HfvKJ+l4kSnD9GYeT17l9+yuxxcD2m2+HIkSRdcWU0ld9bGxDfq7Ifp1/Tkd9D8ivy0O nmZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=1tMnHV/4/e4q+MAB0WmRon6EU9Fl6zVw62+wbVTIBM4=; b=QU6/IaNJFFMhtoZq6Q4ZrdfSA7xaPTcOrd4uN5RobO6iT7tlTHGCPU3FtqD6V9p0sc V/JDzuFMWtqf+PNJ22MbMS6FaCpO7YwiHHUfTAbtMF77yh/506BYXBzIc96eNWtNREBJ hKO0SpdKR9eAeWNS+j/whFnvXZymfuSIsYqWgL9EM4fo9eGrGC89IWGS9RWqUMTKr5cD +ipmMuC7cXEPom2d7FwFOemVcjngC8WPnWsR5c+iopxxITqqhtInk5MQgyGauSo5sNR5 SPHmU5cZrWoef27sScHq4J7IybBcSniry26y0wytmQruAu2WIQy0MOuru3EQ5r0sEqvP bV6g== X-Gm-Message-State: AOAM533+vDew2OT9+QN3w5KYhlK7EEuXhoON2Z6AE6TKD8QQvQwIzxO1 1FiRLoYFyc2N5BmTRpJA+/wCWTGi+0uu/2IBe9WBcUSDb+OdNm0Z6pabq84YGPuuxgC0tL8doUh 3UtutIB+CxHzLI330NtdAM9dtroW47/Kpu6GVPI/7CR1MJzvC0qPm X-Google-Smtp-Source: ABdhPJzLytA/q7cfnp5t/ca+J+FB0QHA8JupkrD1tDqDnUokAh3CNiexziwV/hRV4JPeQ6wbvyNFw4c= X-Received: from scw-glinux.svl.corp.google.com ([2620:15c:2ce:200:f693:9fff:fef4:29b5]) (user=scw job=sendgmr) by 2002:a62:1d43:0:b029:1ab:7f7a:4ab8 with SMTP id d64-20020a621d430000b02901ab7f7a4ab8mr3721623pfd.43.1608319941690; Fri, 18 Dec 2020 11:32:21 -0800 (PST) Date: Fri, 18 Dec 2020 11:32:11 -0800 In-Reply-To: <20201218193213.3566856-1-scw@google.com> Message-Id: <20201218193213.3566856-3-scw@google.com> Mime-Version: 1.0 References: <20201218193213.3566856-1-scw@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH v3 2/4] linux-user: add missing UDP get/setsockopt option To: qemu-devel@nongnu.org, laurent@vivier.eu Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::549; envelope-from=3xQPdXwMKCkY0k4owwotm.kwuymu2-lm3mtvwvov2.wzo@flex--scw.bounces.google.com; helo=mail-pg1-x549.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 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: Shu-Chun Weng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Shu-Chun Weng From: Shu-Chun Weng via X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" SOL_UDP manipulate options at UDP level. All six options currently defined in linux source include/uapi/linux/udp.h take integer values. Signed-off-by: Shu-Chun Weng Reviewed-by: Laurent Vivier --- v1 -> v2: Split out SOL_UDP into own patch. Updated do_print_sockopt(). v2 -> v3: Rebase to master on Dec 18, 2020 linux-user/strace.c | 6 ++++++ linux-user/syscall.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 227812c07e..64172de99d 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -2644,6 +2645,11 @@ static void do_print_sockopt(const char *name, abi_l= ong arg1) print_raw_param(TARGET_ABI_FMT_ld, optname, 0); print_pointer(optval, 0); break; + case SOL_UDP: + qemu_log("SOL_UDP,"); + print_raw_param(TARGET_ABI_FMT_ld, optname, 0); + print_pointer(optval, 0); + break; case SOL_IP: qemu_log("SOL_IP,"); print_raw_param(TARGET_ABI_FMT_ld, optname, 0); diff --git a/linux-user/syscall.c b/linux-user/syscall.c index be39cf8215..8576ad24b7 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -53,6 +53,7 @@ //#include #include #include +#include #include #include #include @@ -2177,7 +2178,8 @@ static abi_long do_setsockopt(int sockfd, int level, = int optname, =20 switch(level) { case SOL_TCP: - /* TCP options all take an 'int' value. */ + case SOL_UDP: + /* TCP and UDP options all take an 'int' value. */ if (optlen < sizeof(uint32_t)) return -TARGET_EINVAL; =20 @@ -2825,7 +2827,8 @@ get_timeout: } break; case SOL_TCP: - /* TCP options all take an 'int' value. */ + case SOL_UDP: + /* TCP and UDP options all take an 'int' value. */ int_case: if (get_user_u32(len, optlen)) return -TARGET_EFAULT; --=20 2.29.2.684.gfbc64c5ab5-goog From nobody Tue Nov 18 07:46:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1608320170; cv=none; d=zohomail.com; s=zohoarc; b=cC735SnBY9w50w+zxfZJAJF4o8lk1A6YnMtGdG8gm5/AWXryAN+xxHCV9DoySAeCDJC3i+CU5u/RVYzfDyU7cKgortSWC8VP2tqztNpWOI2a4TOUNWLBP3b8EF9bVD/ast19Wq0XoQu4k1kAnNbpXu70RRbzCi35lBYQmmIF3xw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608320170; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=olShlt4DrOPr8PLRzTjh9UgQNZd0VxxTaitEcdUgak8=; b=SGX96i0xfDdk/uuZxu+WqfTiy3P7MAV40HEJqFAJ7HVtoFyzplRmR8w17tO2ztv5uWHoV2rajgQG6c58omXUI2EwD5YJINteqDFyPTyOb4POh4RwxOu4GI2IK/Be0AcnxLac3zuuOCFiikfTjkToMLbUtWIRa8QjnIQaciqFHyw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608320170390596.8721558778668; Fri, 18 Dec 2020 11:36:10 -0800 (PST) Received: from localhost ([::1]:60292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqLXt-0001hZ-84 for importer@patchew.org; Fri, 18 Dec 2020 14:36:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3xwPdXwMKCkg2m6qyyqvo.myw0ow4-no5ovxyxqx4.y1q@flex--scw.bounces.google.com>) id 1kqLUN-0006mS-QX for qemu-devel@nongnu.org; Fri, 18 Dec 2020 14:32:31 -0500 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]:40986) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3xwPdXwMKCkg2m6qyyqvo.myw0ow4-no5ovxyxqx4.y1q@flex--scw.bounces.google.com>) id 1kqLUJ-0007vR-8L for qemu-devel@nongnu.org; Fri, 18 Dec 2020 14:32:31 -0500 Received: by mail-yb1-xb4a.google.com with SMTP id c9so4485802ybs.8 for ; Fri, 18 Dec 2020 11:32:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=olShlt4DrOPr8PLRzTjh9UgQNZd0VxxTaitEcdUgak8=; b=dSlz5v+slEffEBM5NG7HxrfU+oBb97cGiY0Sn2p7HBwf1Us0gC31xw2ENlrKeIWZfq lO0ADPNpL1GKJLDHrcz1WWmaA3yuwGGArOx6iTgbs6LzYNlNkOUkZDdjE9LItyAs45pD AVPi7CCwBK+/+kUvI+ZWJLQvTHffM6WqAGq/Om39hZask2uVXIUvdQFLKhSJYEkHSdZJ rTPYDGvicmsJSvitAT1n1WGLmBE3q6yjSucLi6EsjWWXttL7mK9Za7gdaWF3BVUDLvlI o9en4YY0cRemTEk1bspK8kIN0kCydGU8lF5NR5mCkDXRnmx9CpQwBqebgVMjx8P6SovD 68pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=olShlt4DrOPr8PLRzTjh9UgQNZd0VxxTaitEcdUgak8=; b=oK3PxcoSxsl5bRr4TSAGwcyGpUsLVmVNP7yBHRSDQe+4okEZ9baG/p6vWoQ1snYAyL 5Kh+Z97DINVNwh8ANdcwM4Hg09W/yvKYF1Krvb0RpgyUCrSPaTzJoujHNMfKehY+Aihs BsnAWKyUM3lve6H5BsWPcgC/GLKweNSOQhspUAb42X/gaA9mibjuNunFqek7f8BTIVlA umKw77Y2ehYE0svHXWYlrK9w8TCpcjotIgpjzxSu4ie26Tb0IF4MA/fx/QFOtQMpIP+l SJ8DwjRn3nu/EG3eS5BoO9NWdSicL8zKD3/R2Q14Lg4ncvnVMPzXVypfqT77sZ2ACq+y IoCQ== X-Gm-Message-State: AOAM531MDdcwc7huVW5eIXXQwrpMVk0RwdiBqfJFQOkUGZIHT0dapjAv Fowc50pS8x/6YiBkCqn1wVkdaUEXe7T9aIUtkHgIDjpiE6W75R5gzrU9KowexQXxHv8zMaD/QFB avtLl30TNcmMXzk5ZK3XSc+3zByxL5YFY5TMnATB48QMefSTMdgIj X-Google-Smtp-Source: ABdhPJz+9TDRd9sDJh4/1P+e+X10+xyGsEGGlEx1r3VTEWHIDx56keWNIfJl8PRk9vtYAOcyMNi/nzA= X-Received: from scw-glinux.svl.corp.google.com ([2620:15c:2ce:200:f693:9fff:fef4:29b5]) (user=scw job=sendgmr) by 2002:a25:3587:: with SMTP id c129mr8096391yba.223.1608319943651; Fri, 18 Dec 2020 11:32:23 -0800 (PST) Date: Fri, 18 Dec 2020 11:32:12 -0800 In-Reply-To: <20201218193213.3566856-1-scw@google.com> Message-Id: <20201218193213.3566856-4-scw@google.com> Mime-Version: 1.0 References: <20201218193213.3566856-1-scw@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH v3 3/4] linux-user: add missing IPv6 get/setsockopt option To: qemu-devel@nongnu.org, laurent@vivier.eu Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::b4a; envelope-from=3xwPdXwMKCkg2m6qyyqvo.myw0ow4-no5ovxyxqx4.y1q@flex--scw.bounces.google.com; helo=mail-yb1-xb4a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 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: Shu-Chun Weng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Shu-Chun Weng From: Shu-Chun Weng via X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" IPV6_ADDR_PREFERENCES (RFC5014: Source address selection) was not supported. Signed-off-by: Shu-Chun Weng Reviewed-by: Laurent Vivier --- v1 -> v2: Split out IPV6 options into own patch. do_print_sockopt() changes added in a separate patch since a large number= of unrelated changes are involved. v2 -> v3: Rebase to master on Dec 18, 2020 linux-user/syscall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 8576ad24b7..cac4ec3b5a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -51,6 +51,7 @@ #include #include //#include +#include #include #include #include @@ -2265,6 +2266,7 @@ static abi_long do_setsockopt(int sockfd, int level, = int optname, case IPV6_RECVDSTOPTS: case IPV6_2292DSTOPTS: case IPV6_TCLASS: + case IPV6_ADDR_PREFERENCES: #ifdef IPV6_RECVPATHMTU case IPV6_RECVPATHMTU: #endif @@ -2919,6 +2921,7 @@ get_timeout: case IPV6_RECVDSTOPTS: case IPV6_2292DSTOPTS: case IPV6_TCLASS: + case IPV6_ADDR_PREFERENCES: #ifdef IPV6_RECVPATHMTU case IPV6_RECVPATHMTU: #endif --=20 2.29.2.684.gfbc64c5ab5-goog From nobody Tue Nov 18 07:46:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1608320176; cv=none; d=zohomail.com; s=zohoarc; b=Qhfkf2POEdMR63D4cZpYXRBj7NtcQkJfEc1OZC809GP2fJ9eauKeYx1557O+eZffcuD6pVWczd95tDcftq8URKnTRp+qdKXiBh0mAhMMGECMvWI92wvOHO+BLCXgNXtCc6m2MA6smHYjymbqf/iJSq/2ZKXyTLtzNKZ/9vbMnwM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608320176; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=mKDbibzb1OLx7+Yl1f4JMYfTN3DFSQs0DzMsIWEDo4I=; b=P+vHWvF4f+CiwqAq/4lFedjOmGRHPfEgKMMNudUDGknK2y5lx03pvSZFs/jxtTcNl5b4qt5GSkE9r+WCa0G+VPqk09SprpLPjVzW1jMAFhdK19XnadGExsBzpKL+hZhudm6gABH+lnLDcu1BlvWhv//0lBrsFij2Q/6OlTnLEj8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608320176041555.2090193761737; Fri, 18 Dec 2020 11:36:16 -0800 (PST) Received: from localhost ([::1]:60604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqLXy-0001pG-VP for importer@patchew.org; Fri, 18 Dec 2020 14:36:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3yQPdXwMKCko4o8s00sxq.o0y2qy6-pq7qxz0zsz6.03s@flex--scw.bounces.google.com>) id 1kqLUP-0006nM-QP for qemu-devel@nongnu.org; Fri, 18 Dec 2020 14:32:35 -0500 Received: from mail-qt1-x84a.google.com ([2607:f8b0:4864:20::84a]:33004) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3yQPdXwMKCko4o8s00sxq.o0y2qy6-pq7qxz0zsz6.03s@flex--scw.bounces.google.com>) id 1kqLUJ-0007vV-Tv for qemu-devel@nongnu.org; Fri, 18 Dec 2020 14:32:33 -0500 Received: by mail-qt1-x84a.google.com with SMTP id z43so2431689qtb.0 for ; Fri, 18 Dec 2020 11:32:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=mKDbibzb1OLx7+Yl1f4JMYfTN3DFSQs0DzMsIWEDo4I=; b=jAN78CwqHElbIcN+6/eS+DmwU6Owzp0GgLca9enIoCIlXzkqbdlWZ2TbLxw7aZlEDS epcp01DsWSdCz4lQ0T3ZHCBAJwy0ghBuSMyRacTtpCM/T8QwCx2Hee3E/a0BnW8sI21u 6ssKmhTRVaGED7D4ceoWCmi5lR+gMt6/LNxJRYzYTQ7DZiaPiuM42qeUbxjQ/s9vLw0s uflcJWzgoQvuZds17Ir8/K94EndPAnNBVVccKmTo4ODnQhshJ3YvW9JrWcAIx8ifiSs5 A3r6WA0z80lHBmw3t30q/wGnlGz1mlwoqQ0Fv3iChqHkh+avnOccOY1nztqnIInlTTgx 0MNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=mKDbibzb1OLx7+Yl1f4JMYfTN3DFSQs0DzMsIWEDo4I=; b=iX2HaUv9D0O+Y7VrjStXvJDJUop+tSRYzjPM2jbYgnoLmmkv7qDNz6J0njEZDzY4dr MP+6Rz+xhhJ1lRBGZfGi2isdDnLpTVx508GpVtmgdcUkByGEqETVOy93W/BhzWLeHRwO knkoHHkOMd2Py1Nh5xjN/HUeJ5CIlEaUc/F7bEJJ6SAZK0PCsz4IMkfKI4pRWx1fO4tg DQx0rvGq3dtpRQKLBHvmoRpgY38F4OVg8QJEYX9RtsUGe0LV5jNShaaC+1tOPcBROjS2 onhy3iozVYgWkny6GHZQuJgjHVbOr4XFm4dIaNef7xr4LrUce/y586ftFqqMiRr07eDz 28pw== X-Gm-Message-State: AOAM533DsvcBthDByvq759+Y2eXWBfucZAeyyk6NbcaiNtQ+5YLycJ8/ 50kzINXMHqCOW9RDYzWcO5D2bomUEIWe//tGiTXzdNPFtJgf18cyw5qt+b1YRFcQ+Bflh9SOxEr Gb68TYIqpxnzQLraveXHxxns8YM7ZxVXERaKlqDfCLFyX62ZbpGD3 X-Google-Smtp-Source: ABdhPJwjtZJyj7rLDa33/+mMn48CJnZ0qFlMXah/LMGr4YmtPXYSQa1SvYrWN/kqFvbLrwUa7Uly/B0= X-Received: from scw-glinux.svl.corp.google.com ([2620:15c:2ce:200:f693:9fff:fef4:29b5]) (user=scw job=sendgmr) by 2002:a0c:b4a8:: with SMTP id c40mr6093384qve.60.1608319945567; Fri, 18 Dec 2020 11:32:25 -0800 (PST) Date: Fri, 18 Dec 2020 11:32:13 -0800 In-Reply-To: <20201218193213.3566856-1-scw@google.com> Message-Id: <20201218193213.3566856-5-scw@google.com> Mime-Version: 1.0 References: <20201218193213.3566856-1-scw@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH v3 4/4] linux-user: Add IPv6 options to do_print_sockopt() To: qemu-devel@nongnu.org, laurent@vivier.eu Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::84a; envelope-from=3yQPdXwMKCko4o8s00sxq.o0y2qy6-pq7qxz0zsz6.03s@flex--scw.bounces.google.com; helo=mail-qt1-x84a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 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: Shu-Chun Weng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Shu-Chun Weng From: Shu-Chun Weng via X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Shu-Chun Weng Reviewed-by: Laurent Vivier --- v1 -> v2: New: Add all IPV6 options to do_print_sockopt(), including the newly supp= orted IPV6_ADDR_PREFERENCES. v2 -> v3: Rebase to master on Dec 18, 2020 linux-user/strace.c | 108 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/linux-user/strace.c b/linux-user/strace.c index 64172de99d..bc3bb6b2f9 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -2761,6 +2762,113 @@ print_optint: break; } break; + case SOL_IPV6: + qemu_log("SOL_IPV6,"); + switch (optname) { + case IPV6_MTU_DISCOVER: + qemu_log("IPV6_MTU_DISCOVER,"); + goto print_optint; + case IPV6_MTU: + qemu_log("IPV6_MTU,"); + goto print_optint; + case IPV6_V6ONLY: + qemu_log("IPV6_V6ONLY,"); + goto print_optint; + case IPV6_RECVPKTINFO: + qemu_log("IPV6_RECVPKTINFO,"); + goto print_optint; + case IPV6_UNICAST_HOPS: + qemu_log("IPV6_UNICAST_HOPS,"); + goto print_optint; + case IPV6_MULTICAST_HOPS: + qemu_log("IPV6_MULTICAST_HOPS,"); + goto print_optint; + case IPV6_MULTICAST_LOOP: + qemu_log("IPV6_MULTICAST_LOOP,"); + goto print_optint; + case IPV6_RECVERR: + qemu_log("IPV6_RECVERR,"); + goto print_optint; + case IPV6_RECVHOPLIMIT: + qemu_log("IPV6_RECVHOPLIMIT,"); + goto print_optint; + case IPV6_2292HOPLIMIT: + qemu_log("IPV6_2292HOPLIMIT,"); + goto print_optint; + case IPV6_CHECKSUM: + qemu_log("IPV6_CHECKSUM,"); + goto print_optint; + case IPV6_ADDRFORM: + qemu_log("IPV6_ADDRFORM,"); + goto print_optint; + case IPV6_2292PKTINFO: + qemu_log("IPV6_2292PKTINFO,"); + goto print_optint; + case IPV6_RECVTCLASS: + qemu_log("IPV6_RECVTCLASS,"); + goto print_optint; + case IPV6_RECVRTHDR: + qemu_log("IPV6_RECVRTHDR,"); + goto print_optint; + case IPV6_2292RTHDR: + qemu_log("IPV6_2292RTHDR,"); + goto print_optint; + case IPV6_RECVHOPOPTS: + qemu_log("IPV6_RECVHOPOPTS,"); + goto print_optint; + case IPV6_2292HOPOPTS: + qemu_log("IPV6_2292HOPOPTS,"); + goto print_optint; + case IPV6_RECVDSTOPTS: + qemu_log("IPV6_RECVDSTOPTS,"); + goto print_optint; + case IPV6_2292DSTOPTS: + qemu_log("IPV6_2292DSTOPTS,"); + goto print_optint; + case IPV6_TCLASS: + qemu_log("IPV6_TCLASS,"); + goto print_optint; + case IPV6_ADDR_PREFERENCES: + qemu_log("IPV6_ADDR_PREFERENCES,"); + goto print_optint; +#ifdef IPV6_RECVPATHMTU + case IPV6_RECVPATHMTU: + qemu_log("IPV6_RECVPATHMTU,"); + goto print_optint; +#endif +#ifdef IPV6_TRANSPARENT + case IPV6_TRANSPARENT: + qemu_log("IPV6_TRANSPARENT,"); + goto print_optint; +#endif +#ifdef IPV6_FREEBIND + case IPV6_FREEBIND: + qemu_log("IPV6_FREEBIND,"); + goto print_optint; +#endif +#ifdef IPV6_RECVORIGDSTADDR + case IPV6_RECVORIGDSTADDR: + qemu_log("IPV6_RECVORIGDSTADDR,"); + goto print_optint; +#endif + case IPV6_PKTINFO: + qemu_log("IPV6_PKTINFO,"); + print_pointer(optval, 0); + break; + case IPV6_ADD_MEMBERSHIP: + qemu_log("IPV6_ADD_MEMBERSHIP,"); + print_pointer(optval, 0); + break; + case IPV6_DROP_MEMBERSHIP: + qemu_log("IPV6_DROP_MEMBERSHIP,"); + print_pointer(optval, 0); + break; + default: + print_raw_param(TARGET_ABI_FMT_ld, optname, 0); + print_pointer(optval, 0); + break; + } + break; default: print_raw_param(TARGET_ABI_FMT_ld, level, 0); print_raw_param(TARGET_ABI_FMT_ld, optname, 0); --=20 2.29.2.684.gfbc64c5ab5-goog