david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-user: Use safe_syscall wrapper for sleep syscalls

Browse Source 
Use the safe_syscall wrapper for the clock_nanosleep and nanosleep
syscalls.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2016-06-06 19:58:09 +01:00 committed by Riku Voipio
parent b3f8233068
commit 9e518226f4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
linux-user/syscall.c
View File

@ -725,6 +725,12 @@ safe_syscall3(ssize_t, recvmsg, int, fd, struct msghdr *, msg, int, flags)
safe_syscall2(int, flock, int, fd, int, operation) safe_syscall2(int, flock, int, fd, int, operation)
safe_syscall4(int, rt_sigtimedwait, const sigset_t *, these, siginfo_t *, uinfo, safe_syscall4(int, rt_sigtimedwait, const sigset_t *, these, siginfo_t *, uinfo,
const struct timespec *, uts, size_t, sigsetsize) const struct timespec *, uts, size_t, sigsetsize)
safe_syscall2(int, nanosleep, const struct timespec *, req,
struct timespec *, rem)
#ifdef TARGET_NR_clock_nanosleep
safe_syscall4(int, clock_nanosleep, const clockid_t, clock, int, flags,
const struct timespec *, req, struct timespec *, rem)
#endif
#ifdef __NR_msgsnd #ifdef __NR_msgsnd
safe_syscall4(int, msgsnd, int, msgid, const void *, msgp, size_t, sz, safe_syscall4(int, msgsnd, int, msgid, const void *, msgp, size_t, sz,
int, flags) int, flags)
@ -9205,7 +9211,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
{ {
struct timespec req, rem; struct timespec req, rem;
target_to_host_timespec(&req, arg1); target_to_host_timespec(&req, arg1);
ret = get_errno(nanosleep(&req, &rem)); ret = get_errno(safe_nanosleep(&req, &rem));
if (is_error(ret) && arg2) { if (is_error(ret) && arg2) {
host_to_target_timespec(arg2, &rem); host_to_target_timespec(arg2, &rem);
} }
@ -10473,14 +10479,15 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
{ {
struct timespec ts; struct timespec ts;
target_to_host_timespec(&ts, arg3); target_to_host_timespec(&ts, arg3);
ret = get_errno(clock_nanosleep(arg1, arg2, &ts, arg4 ? &ts : NULL)); ret = get_errno(safe_clock_nanosleep(arg1, arg2,
&ts, arg4 ? &ts : NULL));
if (arg4) if (arg4)
host_to_target_timespec(arg4, &ts); host_to_target_timespec(arg4, &ts);
#if defined(TARGET_PPC) #if defined(TARGET_PPC)
/* clock_nanosleep is odd in that it returns positive errno values. /* clock_nanosleep is odd in that it returns positive errno values.
* On PPC, CR0 bit 3 should be set in such a situation. */ * On PPC, CR0 bit 3 should be set in such a situation. */
if (ret) { if (ret && ret != -TARGET_ERESTARTSYS) {
((CPUPPCState *)cpu_env)->crf[0] |= 1; ((CPUPPCState *)cpu_env)->crf[0] |= 1;
} }
#endif #endif