f4f53a5098
- hw/nvme: Remove redundant dma_blk_write - tests/avocado/machine_s390_ccw_virtio: Adapt test to new default resolution - edid: set default resolution to 1280x800 (WXGA) - iotests/308: Fix for CAP_DAC_OVERRIDE - hvf: remove unused but set variable - vvfat: Fix vvfat_write() for writes before the root directory - hw/misc/nrf51_rng: Don't use BIT_MASK() when we mean BIT() - hw/pci: Remove unused pci_irq_pulse() method - ui/gtk: fix leaks found wtih fuzzing - target/i386: fix size of EBP writeback in gen_enter() - tests/qtest/fuzz: fix memleak in qos_fuzz.c - hw/core/loader: gunzip(): fix memory leak on error path - migration: fix a typo - scsi: fetch unit attention when creating the request - raw-format: Fix error message for invalid offset/size - tcg: Reset data_gen_ptr correctly - Fix calculation of minimum in colo_compare_tcp - hw/intc: Don't clear pending bits on IRQ lowering - target/arm: Drop user-only special case in sve_stN_r - usb-hub: Fix handling port power control messages - target/ppc: Set ctx->opcode for decode_insn32() - linux-user: Add proper strace format strings for getdents()/getdents64() - linux-user: Fix TARGET_PROT_SEM for XTENSA - linux-user/hppa: Set TASK_UNMAPPED_BASE to 0xfa000000 for hppa arch - linux-user/hppa: Dump IIR on register dump - tests: Fix typo in check-help output - qdev-core.h: Fix wrongly named reference to TYPE_SPLIT_IRQ - hw/scsi/megasas: Simplify using the ldst API - gqa-win: get_pci_info: Clean dev_info if handle is valid - target/ppc: Fix 7448 support - vvfat: Fix size of temporary qcow file - docs: Correct 'vhost-user-blk' spelling - jackaudio: use ifdefs to hide unavailable functions - simplebench: Fix Python syntax error (reported by LGTM) - python: update type hints for mypy 0.930 - Python/aqmp: fix type definitions for mypy 0.920 - tcg: Allow top bit of SIMD_DATA_BITS to be set in simd_desc() - hw/ppc/e500: Prefer QOM cast - hw/ppc/e500: Remove unused "irqs" parameter - hw/ppc/e500: Add missing device tree properties to i2c controller node - linux-user: Show timespec on strace for futex() - linux-user: Add strace for clock_nanosleep() - linux-user: Fix strace of chmod() if mode == 0 - linux-user: Log failing executable in EXCP_DUMP() - linux-user: Add pidfd_open(), pidfd_send_signal() and pidfd_getfd() syscalls Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 87ebac5b5cfb97ddb7ac2af097703758fb0751c4)
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From b6e7a4895f176d0910059ec3941357cf60af4fd3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=E5=88=98=E5=A9=A720201110?=
|
|
<liujing_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 13 Nov 2024 20:29:29 +0800
|
|
Subject: [PATCH] linux-user: Show timespec on strace for futex()
|
|
|
|
Signed-off-by: Helge Deller <deller@gmx.de>
|
|
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
|
|
Message-Id: <20220918194555.83535-11-deller@gmx.de>
|
|
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
|
Signed-off-by: Liu Jing <liujing_yewu@cmss.chinamobile.com>
|
|
---
|
|
linux-user/strace.c | 11 ++++++++++-
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/linux-user/strace.c b/linux-user/strace.c
|
|
index 37d66d0dff..7978d459f6 100644
|
|
--- a/linux-user/strace.c
|
|
+++ b/linux-user/strace.c
|
|
@@ -3623,11 +3623,20 @@ print_futex(void *cpu_env, const struct syscallname *name,
|
|
abi_long arg0, abi_long arg1, abi_long arg2,
|
|
abi_long arg3, abi_long arg4, abi_long arg5)
|
|
{
|
|
+ abi_long op = arg1 & FUTEX_CMD_MASK;
|
|
print_syscall_prologue(name);
|
|
print_pointer(arg0, 0);
|
|
print_futex_op(arg1, 0);
|
|
print_raw_param(",%d", arg2, 0);
|
|
- print_pointer(arg3, 0); /* struct timespec */
|
|
+ switch (op) {
|
|
+ case FUTEX_WAIT:
|
|
+ case FUTEX_WAIT_BITSET:
|
|
+ print_timespec(arg3, 0);
|
|
+ break;
|
|
+ default:
|
|
+ print_pointer(arg3, 0);
|
|
+ break;
|
|
+ }
|
|
print_pointer(arg4, 0);
|
|
print_raw_param("%d", arg4, 1);
|
|
print_syscall_epilogue(name);
|
|
--
|
|
2.41.0.windows.1
|
|
|