diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-08-23 16:34:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-08-23 16:34:43 +0100 |
| commit | 8367a77c4d3f6e1e60890f5510304feb2c621611 (patch) | |
| tree | b4192098c1b28743b01ffbf3ebbd3025eca9b709 /linux-user/strace.c | |
| parent | 152be6de9100e58b5d896272e951d4c910bd735a (diff) | |
| parent | b3a3af70c377a3e67d43f3be39a333228487b50c (diff) | |
| download | focaccia-qemu-8367a77c4d3f6e1e60890f5510304feb2c621611.tar.gz focaccia-qemu-8367a77c4d3f6e1e60890f5510304feb2c621611.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.2-pull-request' into staging
Add clock_getres_time64, timer_gettime64, timer_settime64,
timerfd_gettime64, timerfd_settime64
Some fixes (page protection, print_fdset, timerspec, itimerspec)
# gpg: Signature made Sun 23 Aug 2020 15:58:53 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-5.2-pull-request:
linux-user: Fix 'utimensat()' implementation
linux-user: Add support for a group of 2038 safe syscalls
linux-user: Modify 'target_to_host/host_to_target_itimerspec()'
linux-user: Adjust guest page protection for the host
linux-user: Validate mmap/mprotect prot value
linux-user: Fix "print_fdset()" in "strace.c" to not print ", " after last value
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/strace.c')
| -rw-r--r-- | linux-user/strace.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux-user/strace.c b/linux-user/strace.c index 13981341b3..5e38048643 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -541,6 +541,7 @@ static void print_fdset(int n, abi_ulong target_fds_addr) { int i; + int first = 1; qemu_log("["); if( target_fds_addr ) { @@ -555,9 +556,12 @@ print_fdset(int n, abi_ulong target_fds_addr) return; for (i=n; i>=0; i--) { - if ((tswapal(target_fds[i / TARGET_ABI_BITS]) >> (i & (TARGET_ABI_BITS - 1))) & 1) - qemu_log("%d,", i); + if ((tswapal(target_fds[i / TARGET_ABI_BITS]) >> + (i & (TARGET_ABI_BITS - 1))) & 1) { + qemu_log("%s%d", get_comma(first), i); + first = 0; } + } unlock_user(target_fds, target_fds_addr, 0); } qemu_log("]"); |