From nobody Tue Nov 4 18:45:58 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 1530554154592775.5118768111756; Mon, 2 Jul 2018 10:55:54 -0700 (PDT) Received: from localhost ([::1]:34668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa33J-0008Qf-Ty for importer@patchew.org; Mon, 02 Jul 2018 13:55:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa2yj-0005FR-AK for qemu-devel@nongnu.org; Mon, 02 Jul 2018 13:51:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fa2yi-0003oz-EZ for qemu-devel@nongnu.org; Mon, 02 Jul 2018 13:51:09 -0400 Received: from mail-ua0-x242.google.com ([2607:f8b0:400c:c08::242]:35918) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fa2yi-0003ok-99 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 13:51:08 -0400 Received: by mail-ua0-x242.google.com with SMTP id y8-v6so10581617uan.3 for ; Mon, 02 Jul 2018 10:51:08 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id j22-v6sm993152uag.15.2018.07.02.10.51.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jul 2018 10:51:07 -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=NOY0CSd6AsdbzuP4t8XGrxLNSj01QXBexvlmkYDU2Mk=; b=FiRPB5y797ug1XtC3aJYHvKYcdIxufeufCAE0o7ZYWbIVdiGrywLYOSoDVGXKjXErg flhtn4Nmz1kTbyp7fUHUX9wh/aw8VfmH1I2bRuaJN8vGCtiYpl1fkBibVIZ49nGKL/Hf RVWOaCnTFSZhO/3qOFxqVTOCzWc6wmnR3dUsb0W+UNayW0vKeQnLJXYbEuo3w7isohZx HoZn14QuQ5PZxGnn6yKNG6hwAhe3nOyLtYEVM9apN509Q3sXDQj0PSIyU432bi6vY3fR AnKQS++jxC/HA2HwpfmrYr1xemoiAKIaHzkuVJv0oDevNGaGcanDJFanZ6El6AH8VDzx Ifcw== 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=NOY0CSd6AsdbzuP4t8XGrxLNSj01QXBexvlmkYDU2Mk=; b=LWrZQXy7gFWB32S3WKMCXWAZpHOST4BeEdozvCUFOoEpFLEbD2L+leUUbqqm+NnvyG PXQqOuIcvzT01DP+Jfi5/CHLqppjvd7t1TArccl9Y4D81Sv7JjT7ScWq/KHtLnxplVSc QhcsVwPupanWkyyvJamUFIbsIIepRlmi7ULwy401c4hwaG23B8n83ceHT+kb9zAutFeU KsYOfDopQFJ/NbgB4e4wPQQhWxh5veiz9QtARkpoXq4+yRKynpggW45PNbtBXI7NuBRu Yf5AzIjRXnfK2dXRg9XUA1nBgYU67zy6ul0ZWw/Yfmsk4byAzNOokZsQeJqNz39EIVgU 4D/g== X-Gm-Message-State: APt69E0wbgfL6euSM2OgvvRaQEeBl65W3osxLuW3B2f4jpyGfsvzq6/9 Gy0S+Q87rPvimwW8nDLaewk= X-Google-Smtp-Source: AAOMgpei/43uB2KCG+GR37F2cW/JYP0PASsD6m0P9feCEMWaNQ0A6saSwE3z3QjfbaJfQecAL5DA4w== X-Received: by 2002:ab0:3199:: with SMTP id d25-v6mr17368634uan.31.1530553867641; Mon, 02 Jul 2018 10:51:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Laurent Vivier Date: Mon, 2 Jul 2018 14:50:27 -0300 Message-Id: <20180702175030.18621-11-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180702175030.18621-1-f4bug@amsat.org> References: <20180702175030.18621-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:400c:c08::242 Subject: [Qemu-devel] [PATCH v3 10/13] 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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 390a50d45a..85a1efef32 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 @@ -1658,7 +1658,7 @@ static void do_print_sockaddr(const char *name, abi_l= ong arg1) =20 gemu_log("%s(", name); print_raw_param(TARGET_ABI_FMT_ld, sockfd, 0); - print_sockaddr(addr, addrlen); + print_sockaddr(addr, addrlen, 0); gemu_log(")"); } =20 @@ -1728,7 +1728,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 @@ -1966,7 +1966,7 @@ print_bind(const struct syscallname *name, { print_syscall_prologue(name); print_raw_param("%d", arg0, 0); - print_sockaddr(arg1, arg2); + print_sockaddr(arg1, arg2, 1); print_syscall_epilogue(name); } #endif @@ -1982,7 +1982,7 @@ print_sendto(const struct syscallname *name, print_buf(arg1, arg2, 0); print_raw_param(TARGET_ABI_FMT_ld, arg2, 0); print_flags(msg_flags, arg3, 0); - print_sockaddr(arg4, arg5); + print_sockaddr(arg4, arg5, 1); print_syscall_epilogue(name); } #endif --=20 2.18.0