From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C7F49D778B0 for ; Fri, 23 Jan 2026 20:54:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vjO9J-0000dS-1L; Fri, 23 Jan 2026 15:52:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vjO9G-0000ak-Tg for qemu-devel@nongnu.org; Fri, 23 Jan 2026 15:52:54 -0500 Received: from tor.source.kernel.org ([172.105.4.254]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vjO9F-0006zb-Iz for qemu-devel@nongnu.org; Fri, 23 Jan 2026 15:52:54 -0500 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 0149E60053; Fri, 23 Jan 2026 20:52:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45269C116D0; Fri, 23 Jan 2026 20:52:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769201572; bh=Jf62z9nlMLpALlcWZJZDbVgTeJxR/J8Rcqx9XgcCPa0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fUlBNUYWFQPuvOwDVQdbLlnP1vk3DfWPrgfh96QAN7g7NKEQWTO+LvM778xSZoKT3 poueCuxZaHKHu/xMsqnat+M2SCdVW08HNVyYhh8FKzZkwgjvyq22CAKbRlLnmWxA1v IPmlwwhUX425de+GsKmnaNEZd9OW9jtYtRi76yvIml9ICbnq6NRmDE1IlUvLi2kDRO y9Eyl+R/hOmeJLd/2/DYNI5KLkpS4heNM9kJquY1HGqWDvWaIKqmmIxLqgvfrPtTiU g8MkEXx0TdU/LIE3GBAYvRkOrDKQzEufe9eQLnauyXNA9U0OdwZ56FWfk2NZbbQiz6 pj6u6FKNOSIMg== From: deller@kernel.org To: Richard Henderson , qemu-devel@nongnu.org Cc: Laurent Vivier , Jiaxun Yang , deller@gmx.de, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 10/11] linux-user: strace: Fix 5th argument of futex syscall Date: Fri, 23 Jan 2026 21:52:29 +0100 Message-ID: <20260123205230.33541-11-deller@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260123205230.33541-1-deller@kernel.org> References: <20260123205230.33541-1-deller@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=172.105.4.254; envelope-from=deller@kernel.org; helo=tor.source.kernel.org X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.079, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Helge Deller The 5th argument isn't printed, but instead the 4th argument is shown twice. Fix this, and print the FUTEX_BITSET_MATCH_ANY string constant instead of -1 if the op is FUTEX_WAIT_BITSET or FUTEX_WAKE_BITSET. Signed-off-by: Helge Deller Reviewed-by: Peter Maydell --- linux-user/strace.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 18bc6c800c..ca67cfd09d 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -4150,7 +4150,12 @@ print_futex(CPUArchState *cpu_env, const struct syscallname *name, break; } print_pointer(arg4, 0); - print_raw_param("%d", arg4, 1); + if ((op == FUTEX_WAIT_BITSET || (op == FUTEX_WAKE_BITSET)) && + (arg5 == FUTEX_BITSET_MATCH_ANY)) { + qemu_log("FUTEX_BITSET_MATCH_ANY"); + } else { + print_raw_param("%#x", arg5, 1); + } print_syscall_epilogue(name); } #endif -- 2.52.0