From nobody Fri Nov 7 12:35:13 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 1539211172040722.5448820341286; Wed, 10 Oct 2018 15:39:32 -0700 (PDT) Received: from localhost ([::1]:59436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAN8Y-0003tP-F4 for importer@patchew.org; Wed, 10 Oct 2018 18:39:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAN6O-0002fv-O3 for qemu-devel@nongnu.org; Wed, 10 Oct 2018 18:37:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAN6N-0000Qy-LH for qemu-devel@nongnu.org; Wed, 10 Oct 2018 18:37:12 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:39675) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gAN6N-0000OZ-DK for qemu-devel@nongnu.org; Wed, 10 Oct 2018 18:37:11 -0400 Received: by mail-wr1-x42e.google.com with SMTP id 61-v6so7451271wrb.6 for ; Wed, 10 Oct 2018 15:37:10 -0700 (PDT) Received: from x1.local (26.red-83-32-208.dynamicip.rima-tde.net. [83.32.208.26]) by smtp.gmail.com with ESMTPSA id q77-v6sm10344886wmd.33.2018.10.10.15.37.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Oct 2018 15:37:08 -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=GwUCsIlCX+6WpZBneg9X1OhKU/JQO9jslVgj3i81wac=; b=l55sQ4yYojSmkIXK3KpYeK0Pmnf/EfxIl7hXguPTyoDoxuyrGB7uaYlbLdueM5KyQd tkmCkOCvzJHGu2xQokCjr2sjq51dbcuUGFACZRp35xnHHbiL1DqBP70FlOiDcZs4K7Yv nr9+Hgr4SQAtdNhuWWMlG5vn0STgYItop9aCDS2wLCaPyIOJD5+dyeh+l5yi4fiDU9TE 1jHbmGyfS4iLxSv3VoEqX3nruGjm/Pk4EhE2OUKbK+hDS1QsVx6Ddzxtq+25fivjXWDm Qxpb/nGpwqfqDueTok2I6QeTFlqlIMVcdAP6zfY1jRnQFFe6/l+DPBiUN+/OZdKrHlMk 3fUQ== 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=GwUCsIlCX+6WpZBneg9X1OhKU/JQO9jslVgj3i81wac=; b=Q9cZV74hEXuwP/CEnrzjHJQ40UprRpsMCRLJTo46wqMWDlJTRKCmN/kj/uOg1Fqkn4 JXFZFh9Y1aLB7BLQwAH4CNQwgcf2epKwIleyYNFmiqvUSXBxJiTdG9sHE/STyyAPK2it jXk2N98IvugQ3BqeJjdC52gkBDjwo5EMkgeOIX2PqRQaawR7Lk0J9O8DVj79w6el74Kb 9sdUSmROyTyhvuOsTSWbGvqBH96tHnQ2YbLjaTqkV+dbq4B5XjGJVPDZHq02TC0fcuT0 kYK9ZsvME83bwbbFvGgWNZgV1QUKObhTqiuTS78OPsKrnpxJqA8K29vw1tG3W5+uIcYb GQdw== X-Gm-Message-State: ABuFfoiVxEy/yKDz/gcSPpS+c/032CdR2i8JmAV0H+eiblAVxjFUbBqN BIFWPDG/xUgEN/Wo7pxOsEI= X-Google-Smtp-Source: ACcGV60jcSPPYR+H2u1999Ol3hrkqfreCVYW479VLSgKk2ZGmqZoDawZmpznabr09feZCIAAb/xVew== X-Received: by 2002:adf:9b12:: with SMTP id b18-v6mr19413704wrc.35.1539211029380; Wed, 10 Oct 2018 15:37:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Laurent Vivier Date: Thu, 11 Oct 2018 00:36:53 +0200 Message-Id: <20181010223656.31632-8-f4bug@amsat.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181010223656.31632-1-f4bug@amsat.org> References: <20181010223656.31632-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: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PATCH v5 07/10] 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 425c06d169..5435d01569 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.19.1