[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/16] linux-user: fix clock_nanosleep()
From: |
Alex Bennée |
Subject: |
[PULL 12/16] linux-user: fix clock_nanosleep() |
Date: |
Mon, 27 Jul 2020 13:23:53 +0100 |
From: Laurent Vivier <laurent@vivier.eu>
If the call is interrupted by a signal handler, it fails with error EINTR
and if "remain" is not NULL and "flags" is not TIMER_ABSTIME, it returns
the remaining unslept time in "remain".
Update linux-user to not overwrite the "remain" structure if there is no
error.
Found with "make check-tcg", linux-test fails on nanosleep test:
TEST linux-test on x86_64
.../tests/tcg/multiarch/linux-test.c:242: nanosleep
Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200722174612.2917566-2-laurent@vivier.eu>
Message-Id: <20200724064509.331-13-alex.bennee@linaro.org>
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1211e759c26..43a6e283961 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11831,8 +11831,14 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
target_to_host_timespec(&ts, arg3);
ret = get_errno(safe_clock_nanosleep(arg1, arg2,
&ts, arg4 ? &ts : NULL));
- if (arg4)
+ /*
+ * if the call is interrupted by a signal handler, it fails
+ * with error -TARGET_EINTR and if arg4 is not NULL and arg2 is not
+ * TIMER_ABSTIME, it returns the remaining unslept time in arg4.
+ */
+ if (ret == -TARGET_EINTR && arg4 && arg2 != TIMER_ABSTIME) {
host_to_target_timespec(arg4, &ts);
+ }
#if defined(TARGET_PPC)
/* clock_nanosleep is odd in that it returns positive errno values.
--
2.20.1
- [PULL 00/16] various fixes for rc2 (semihosting, tcg, docker, tests/vm), Alex Bennée, 2020/07/27
- [PULL 01/16] shippable: add one more qemu to registry url, Alex Bennée, 2020/07/27
- [PULL 02/16] semihosting: defer connect_chardevs a little more to use serialx, Alex Bennée, 2020/07/27
- [PULL 03/16] semihosting: don't send the trailing '\0', Alex Bennée, 2020/07/27
- [PULL 04/16] util: add qemu_get_host_physmem utility function, Alex Bennée, 2020/07/27
- [PULL 05/16] util/oslib-win32: add qemu_get_host_physmem implementation, Alex Bennée, 2020/07/27
- [PULL 06/16] accel/tcg: better handle memory constrained systems, Alex Bennée, 2020/07/27
- [PULL 08/16] linux-user: don't use MAP_FIXED in pgd_find_hole_fallback, Alex Bennée, 2020/07/27
- [PULL 07/16] target/i386: floatx80: avoid compound literals in static initializers, Alex Bennée, 2020/07/27
- [PULL 12/16] linux-user: fix clock_nanosleep(),
Alex Bennée <=
- [PULL 09/16] tests/docker: fix update command due to python3 str/bytes distinction, Alex Bennée, 2020/07/27
- [PULL 10/16] tests/docker: fix binfmt_misc image building, Alex Bennée, 2020/07/27
- [PULL 14/16] python/qemu: Cleanup changes to ConsoleSocket, Alex Bennée, 2020/07/27
- [PULL 11/16] tests/docker: add support for DEB_KEYRING, Alex Bennée, 2020/07/27
- [PULL 13/16] linux-user, ppc: fix clock_nanosleep() for linux-user-ppc, Alex Bennée, 2020/07/27
- [PULL 15/16] python/qemu: Change ConsoleSocket to optionally drain socket., Alex Bennée, 2020/07/27
- [PULL 16/16] tests/vm: add shutdown timeout in basevm.py, Alex Bennée, 2020/07/27
- Re: [PULL 00/16] various fixes for rc2 (semihosting, tcg, docker, tests/vm), Peter Maydell, 2020/07/27