From patchwork Tue Oct 22 08:11:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1181135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46y5yk0ky6z9sNx for ; Tue, 22 Oct 2019 19:19:42 +1100 (AEDT) Received: from localhost ([::1]:51458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMpOF-0002JH-U1 for incoming@patchwork.ozlabs.org; Tue, 22 Oct 2019 04:19:39 -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 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_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé If the format is not the syscall last argument, a comma is append. Signed-off-by: Philippe Mathieu-Daudé 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 protocol); @@ -336,7 +336,7 @@ static void print_siginfo(const target_siginfo_t *tinfo) } 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)); } static void @@ -1751,7 +1751,7 @@ static void do_print_sockaddr(const char *name, abi_long arg1) gemu_log("%s(", name); print_sockfd(sockfd, 0); - print_sockaddr(addr, addrlen); + print_sockaddr(addr, addrlen, 0); gemu_log(")"); } @@ -1821,7 +1821,7 @@ static void do_print_msgaddr(const char *name, abi_long 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(")"); }