From nobody Tue Nov 4 18:35:15 2025 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 15306323218425.825796574537776; Tue, 3 Jul 2018 08:38:41 -0700 (PDT) Received: from localhost ([::1]:41153 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faNO5-0002vD-2F for importer@patchew.org; Tue, 03 Jul 2018 11:38:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faNJo-0008QM-Bs for qemu-devel@nongnu.org; Tue, 03 Jul 2018 11:34:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faNJn-0001bP-2w for qemu-devel@nongnu.org; Tue, 03 Jul 2018 11:34:16 -0400 Received: from mail-qk0-x231.google.com ([2607:f8b0:400d:c09::231]:38914) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faNJm-0001bI-U6 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 11:34:15 -0400 Received: by mail-qk0-x231.google.com with SMTP id f3-v6so1209330qkd.6 for ; Tue, 03 Jul 2018 08:34:14 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id k66-v6sm848715qkc.86.2018.07.03.08.34.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 08:34:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DbSyyXs6Ct55gUV6cchh05VA/ct+bylnTwo+QGuf6Mg=; b=W50qjmtemWT4rksZF7bJFgqHhvvmwlKyMalXc0Hy/1q23FXfNuA5xPb5Y99VrggVLo bxifzR4+pQUBw6lDcpWm3ZA/BrL/x1rIVnMk8NhoYB+g2/PkabJeoAe8FL2UBxzud5a/ BFOARiaiEkQWJ4m1IlbpxZJ9T+29krdE1ZQjiuukAf/rGNPAtrR8i6viDHvhXdYDQenz tfQAmw0WknQrpHRXfonwuo7jGeXzTwM743DqFjkJloMpQumFxaZlMl1LlFwMInKWyMz8 +LOVQj0eokI9T4hZnwD8MCW4jsj6bSVyMqN4EBPuJZgkf8EThYF9uLHdu0NyeK0WTaCf 10qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DbSyyXs6Ct55gUV6cchh05VA/ct+bylnTwo+QGuf6Mg=; b=VyF8aV9E0HTJkE8SoXqF8C0PnpJa04hpu4EycYt5CyNOr5pG9mok5RAh/Rx1XeRLZW TN2qux00biwGcnZL85kJKK+X0YdKhYlzUTDXKJLF4s2B9pccOhKH6Zw9Tgx9SBYK1Yvs lVNxR2j5XPITipZqh7/sTcF6Bm2/LdGeCad2rK3k3gfU6S57FT+36xFXqN6yxIojyAV1 wNi+vftCTrAgLeJ/9LY+ZwHg+AfSgrwFPuLpLCWoed2H7bUZJBmumIITR/KJNGN7vjJ4 rYBf+yA6JfO7B8HS0f3iW3hLneY57wJB3VmjQRdRJqgSoHjeP7LblmibztFXHi4ItMKV liNQ== X-Gm-Message-State: APt69E2msX6NhjQD9yKaGdhyuhgAIPJAfRP6fhNzvHRI0I9leZvD3kww blM88yVxvv6XhjjpGM2jQIA= X-Google-Smtp-Source: AAOMgpfPeXJ+Qj3nyO6i3mECQ2nBUCbaF2PZC18nQpdPQWG8XEjUudNLnqQbK3QskUZqRU+G61IgKw== X-Received: by 2002:ae9:c002:: with SMTP id u2-v6mr21718505qkk.391.1530632054397; Tue, 03 Jul 2018 08:34:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Laurent Vivier Date: Tue, 3 Jul 2018 12:33:43 -0300 Message-Id: <20180703153346.9050-10-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180703153346.9050-1-f4bug@amsat.org> References: <20180703153346.9050-1-f4bug@amsat.org> 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:400d:c09::231 Subject: [Qemu-devel] [PATCH v4 09/12] linux-user/strace: Add print_sockfd() 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?Guido=20G=C3=BCnther?= , Riku Voipio , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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 Extract common print_sockfd() from various socket related syscalls. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/strace.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 48ba715557..54060eed93 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -1651,6 +1651,11 @@ static void do_print_socket(const char *name, abi_lo= ng arg1) gemu_log(")"); } =20 +static void print_sockfd(abi_long sockfd, int last) +{ + print_raw_param(TARGET_ABI_FMT_ld, sockfd, last); +} + static void do_print_sockaddr(const char *name, abi_long arg1) { abi_ulong sockfd, addr, addrlen; @@ -1660,7 +1665,7 @@ static void do_print_sockaddr(const char *name, abi_l= ong arg1) get_user_ualx(addrlen, arg1, 2); =20 gemu_log("%s(", name); - print_raw_param(TARGET_ABI_FMT_ld, sockfd, 0); + print_sockfd(sockfd, 0); print_sockaddr(addr, addrlen); gemu_log(")"); } @@ -1673,7 +1678,7 @@ static void do_print_listen(const char *name, abi_lon= g arg1) get_user_ualx(backlog, arg1, 1); =20 gemu_log("%s(", name); - print_raw_param(TARGET_ABI_FMT_ld, sockfd, 0); + print_sockfd(sockfd, 0); print_raw_param(TARGET_ABI_FMT_ld, backlog, 1); gemu_log(")"); } @@ -1708,7 +1713,7 @@ static void do_print_sendrecv(const char *name, abi_l= ong arg1) get_user_ualx(flags, arg1, 3); =20 gemu_log("%s(", name); - print_raw_param(TARGET_ABI_FMT_ld, sockfd, 0); + print_sockfd(sockfd, 0); print_buf(msg, len, 0); print_raw_param(TARGET_ABI_FMT_ld, len, 0); print_flags(msg_flags, flags, 1); @@ -1727,7 +1732,7 @@ static void do_print_msgaddr(const char *name, abi_lo= ng arg1) get_user_ualx(addrlen, arg1, 5); =20 gemu_log("%s(", name); - print_raw_param(TARGET_ABI_FMT_ld, sockfd, 0); + print_sockfd(sockfd, 0); print_buf(msg, len, 0); print_raw_param(TARGET_ABI_FMT_ld, len, 0); print_flags(msg_flags, flags, 0); @@ -1743,7 +1748,7 @@ static void do_print_shutdown(const char *name, abi_l= ong arg1) get_user_ualx(how, arg1, 1); =20 gemu_log("shutdown("); - print_raw_param(TARGET_ABI_FMT_ld, sockfd, 0); + print_sockfd(sockfd, 0); switch (how) { case SHUT_RD: gemu_log("SHUT_RD"); @@ -1770,7 +1775,7 @@ static void do_print_msg(const char *name, abi_long a= rg1) get_user_ualx(flags, arg1, 2); =20 gemu_log("%s(", name); - print_raw_param(TARGET_ABI_FMT_ld, sockfd, 0); + print_sockfd(sockfd, 0); print_pointer(msg, 0); print_flags(msg_flags, flags, 1); gemu_log(")"); @@ -1787,7 +1792,7 @@ static void do_print_sockopt(const char *name, abi_lo= ng arg1) get_user_ualx(optlen, arg1, 4); =20 gemu_log("%s(", name); - print_raw_param(TARGET_ABI_FMT_ld, sockfd, 0); + print_sockfd(sockfd, 0); switch (level) { case SOL_TCP: gemu_log("SOL_TCP,"); --=20 2.18.0