From nobody Wed Feb 11 00:55:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571732434; cv=none; d=zoho.com; s=zohoarc; b=fIidkv42QAFpXCk3BfWgho9M2G7OTDLoEaWoAsLv45lW4o38MFxC2yAmTjhH8kyNbz35YDl5svoxvZKpYFDEaHQt/+ORGRQ90X/6StiiytjuIPQa8wN1Eqx/wXsxYIgBifF2AnDEXPjLmGb9NfaLvDD+PbAk6IOJ+vS9zouiC1o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571732434; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xyIs0jy8kU45gaNSyFcP98kTnqPGwOBbsvtvkWQMw0o=; b=RNL0BMXYG7gFuyN6iZuCmqWAlKgauJ6FXfMv6GisFNLF8bhU70L6bmtdItXHgnO3XxNTPGUJJFBwKGZVjs6zHZSDIm2T9lpVF94a3+DLJ2H18rYxch3ptVGE8U5ojgKUdJYuI2xCnxbRm7QFwqDQpmDjV0Io7teWblceHzKLlvU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571732434518473.77109456117114; Tue, 22 Oct 2019 01:20:34 -0700 (PDT) Received: from localhost ([::1]:51466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMpP7-0003eH-4K for importer@patchew.org; Tue, 22 Oct 2019 04:20:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44170) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMpGH-0002jR-5p for qemu-devel@nongnu.org; Tue, 22 Oct 2019 04:11:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMpGF-00054q-So for qemu-devel@nongnu.org; Tue, 22 Oct 2019 04:11:25 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:60673) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMpGF-00053n-JA for qemu-devel@nongnu.org; Tue, 22 Oct 2019 04:11:23 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MkIAB-1hcinI192H-00kfrP; Tue, 22 Oct 2019 10:11:21 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 10/11] linux-user/strace: Let print_sockaddr() have a 'last' argument Date: Tue, 22 Oct 2019 10:11:03 +0200 Message-Id: <20191022081104.11814-11-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022081104.11814-1-laurent@vivier.eu> References: <20191022081104.11814-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:+eWyWt+jEeAqX7ytazpX5umvzc8LjyX/xkhUAMODHFMpjd5Dly3 yetQpVLUcQ2tvnl0D/zNYRr9yaUwhKsHk9c8F9cNCTdJz0NGDJT2i8+SWAwEqTdfI69a3zV SjCVrvRZD+kubO24PFuLQdf9BxuZvzMAyJJVzmiZAxFH6j3qCZ07YtmDWRCUmFgs/BFSjxQ thl8JfdsII27v/k04I8Rw== X-UI-Out-Filterresults: notjunk:1;V03:K0:ddRbnsiiX34=:dcTAew5CMiDdxirgVkKVT4 OS7CUi2h+ddAyoNLj0Ntvv+T60b6AIDlh2eU65YKAxvYyszp+DrOVXVi+7OA4TwbqdDGXioO6 7DziRPRz5gsGVmQ7FQND6R33Pl8K0wc7BtjurGc4ZpaHE1eN2C9adXjaAq/FJsUmmRw2Ckg0F wteq8447K04zQoT7hHotX3tJlRBwR+PJehdUPOI64DgjyKakuytbUWIxQ3MVIi+RZVNhZPz6q fVR5KIwNumHa65ArMMN1oCIlIraEo1+vsdur0o58HeGIRE9OuCAGRfiXbL+ASO8TBCEKmDxHZ iWhe8cwKcPyg3PcJoZMo4ob5FgYNJzXmKUxLZ2jQ/S713L3iZ2SmURRQmqiDxUAhVya0EJPY8 6kjD3zXDe20pYCDuhVS0iAtNvOJMQ1m/SgB7dZgK9s2kC0kGoznGL2Mmss6dVxiMbhrCgzE03 5OZfCwmnp0fDDTZKaaP0EaPtCKnc/H6KKZ3JbwLmhhlc2Xnj6NbcMAPj4VZwtc2fuOTJU5vrF CjWG2VUwcwaNleOodpfan2hYQrv506HZbfxSf+ZMm7OjSz+MMYIcgvazRZwaLGK3E6gRmBL5h 1U7PAxEg7IJ5huOgVIaDQ6bm+iJKlF5wa6sFwE7WTN16JFZPgepu+kk0xd4uDuC7ODr+XSmtt 5TYha9GdGqhNYHRip9s0LTX25TMiWyb4FmJlPwv042fkG9u1oTw5GGnwkz3qL1Y7Q4s74lq5O 4I1MG2M6CAQ1DntxQW7jhNPbZ3TvB2HXESrQeXZfjLxZ2kIQnxPiDXah5ZZL4YWVwMUygI89A hXqiVp/Ibtkna3XR2VH7DsZ5EpZuKU2v2dokonUIuzr0/5t2XK3sXsDVKK5NvHUwTVeVL/kiQ 0n7ZAgs6AijKinRjbbV+E9MAtfams6XaW3z05fMMc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.10 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: Riku Voipio , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daud=C3=A9 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 Reviewed-by: Laurent Vivier Message-Id: <20191021114857.20538-9-f4bug@amsat.org> Signed-off-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 cd92c77d3366..3d4d6844500e 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, abi_long, 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 @@ -1751,7 +1751,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 @@ -1821,7 +1821,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.21.0