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 1530632651908735.1712067218249; Tue, 3 Jul 2018 08:44:11 -0700 (PDT) Received: from localhost ([::1]:41188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faNTK-0007fk-Nu for importer@patchew.org; Tue, 03 Jul 2018 11:44:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faNJq-0008SS-D8 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 11:34:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faNJp-0001gF-HZ for qemu-devel@nongnu.org; Tue, 03 Jul 2018 11:34:18 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:42561) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faNJp-0001fM-Cm for qemu-devel@nongnu.org; Tue, 03 Jul 2018 11:34:17 -0400 Received: by mail-qt0-x243.google.com with SMTP id y31-v6so1917848qty.9 for ; Tue, 03 Jul 2018 08:34:17 -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.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 08:34:16 -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=tblbqanEwgyyHUVFIgqXhIj+7wnCXuxEoc6frachdLs=; b=CFSF4Rfj+0hBhgjDuuxtQgrH8WJkkavBJc1TydMO5HsVENcNVIuxAFC1C//v3HgTHT DMQ/UA5bj7o/bX2RK7zunzBV7ZieLVj5u3V4qmkjJNiqlhoL5I2x6by5pX6rWhcd/ZkO Wv2H9TcPPK0g+WxVTDxFewz2xEOyfjXeRfecpAqgtHn9w14awDUaQlXEqi3Z33+6oz+H ZT+Ar9ftOsIqwPm/3JMm5WoktLgjTR+5jLm11WpDNiIoMS7KTzLh2c1LtYSUz/+gR7hD oR6Dy5Z/dSbTVKzbWRQHl10dvKPVz3a+CdTUGlMB5NVBk0qFymEebkAo2y8MjlwCbvB9 rzQw== 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=tblbqanEwgyyHUVFIgqXhIj+7wnCXuxEoc6frachdLs=; b=auQbKAydsvPsdFL+BFuGmkyeMuUF4nI6/K78BPSWr4hFtvVSgwILHFcIrRh/izIFgG BhdXlSX3A4hMZN6Q3WWjHGF/7nNslPpWKyR/KErMO/UPi2wJsl61mm/MKjTlpccTQcwM Hq3kpm98ye8XiDtV5F2kIlIloaNLAXlRij5+w2fswolLSLDgjzxCWnZnjfUMlDMik2dG YgdxlG+KdNfLTnU22WLbrTft4dYiCB9LtWq32LErdtgwSOuWIye6zWRLwTe1QPhnR3fm eFha1jXUxUginJwIfpcl2XOP9D/HsbnI+JRZ6FfFldEYDltXylfVf4WyvCV6kouPBWOe T+ZA== X-Gm-Message-State: APt69E1CNOvBvvjAh3TVsquhClG4MJAabk2HG9WA/l25DKd6FSfMMEui qHccMcActOV8DTvYa4H6K9g= X-Google-Smtp-Source: AAOMgpcVwKzCOmaWC3PYc/wsbsGiZIHlB79Mt8f8GL3/+V0Ps7uf3onTX5i2A/G2O2C7/hHMxamnHg== X-Received: by 2002:a0c:a3c3:: with SMTP id v61-v6mr25969197qvv.99.1530632056846; Tue, 03 Jul 2018 08:34:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Laurent Vivier Date: Tue, 3 Jul 2018 12:33:44 -0300 Message-Id: <20180703153346.9050-11-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:c0d::243 Subject: [Qemu-devel] [PATCH v4 10/12] linux-user/strace: Let print_sockaddr() have a 'last' argument 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 If the format is not the syscall last argument, a comma is append. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier --- linux-user/strace.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 54060eed93..19222d2192 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -67,7 +67,7 @@ UNUSED static void print_timeval(abi_ulong, int); UNUSED static void print_timezone(abi_ulong, int); UNUSED static void print_number(abi_long, int); UNUSED static void print_signal(abi_ulong, int); -UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen); +UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen, int); UNUSED static void print_socket_domain(int domain); UNUSED static void print_socket_type(int type); UNUSED static void print_socket_protocol(int domain, int type, int protoco= l); @@ -336,7 +336,7 @@ static void print_siginfo(const target_siginfo_t *tinfo) } =20 static void -print_sockaddr(abi_ulong addr, abi_long addrlen) +print_sockaddr(abi_ulong addr, abi_long addrlen, int last) { struct target_sockaddr *sa; int i; @@ -418,7 +418,7 @@ print_sockaddr(abi_ulong addr, abi_long addrlen) } else { print_raw_param("0x"TARGET_ABI_FMT_lx, addr, 0); } - gemu_log(", "TARGET_ABI_FMT_ld, addrlen); + gemu_log(", "TARGET_ABI_FMT_ld"%s", addrlen, get_comma(last)); } =20 static void @@ -1666,7 +1666,7 @@ static void do_print_sockaddr(const char *name, abi_l= ong arg1) =20 gemu_log("%s(", name); print_sockfd(sockfd, 0); - print_sockaddr(addr, addrlen); + print_sockaddr(addr, addrlen, 0); gemu_log(")"); } =20 @@ -1736,7 +1736,7 @@ static void do_print_msgaddr(const char *name, abi_lo= ng arg1) print_buf(msg, len, 0); print_raw_param(TARGET_ABI_FMT_ld, len, 0); print_flags(msg_flags, flags, 0); - print_sockaddr(addr, addrlen); + print_sockaddr(addr, addrlen, 0); gemu_log(")"); } =20 --=20 2.18.0