[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 034/108] linux-user: Split out getrlimit, getrusa
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v2 034/108] linux-user: Split out getrlimit, getrusage, gettimeofday, settimeofday |
Date: |
Sat, 9 Jun 2018 17:01:06 -1000 |
Signed-off-by: Richard Henderson <address@hidden>
---
linux-user/syscall.c | 117 ++++++++++++++++++++++---------------------
1 file changed, 61 insertions(+), 56 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ac3592d776..4c5292efed 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8152,6 +8152,49 @@ IMPL(getppid)
}
#endif
+IMPL(getrlimit)
+{
+ int resource = target_to_host_resource(arg1);
+ struct target_rlimit *target_rlim;
+ struct rlimit rlim;
+ abi_long ret;
+
+ ret = get_errno(getrlimit(resource, &rlim));
+ if (!is_error(ret)) {
+ if (!lock_user_struct(VERIFY_WRITE, target_rlim, arg2, 0)) {
+ return -TARGET_EFAULT;
+ }
+ target_rlim->rlim_cur = host_to_target_rlim(rlim.rlim_cur);
+ target_rlim->rlim_max = host_to_target_rlim(rlim.rlim_max);
+ unlock_user_struct(target_rlim, arg2, 1);
+ }
+ return ret;
+}
+
+IMPL(getrusage)
+{
+ struct rusage rusage;
+ abi_long ret;
+
+ ret = get_errno(getrusage(arg1, &rusage));
+ if (!is_error(ret) && host_to_target_rusage(arg2, &rusage)) {
+ return -TARGET_EFAULT;
+ }
+ return ret;
+}
+
+IMPL(gettimeofday)
+{
+ struct timeval tv;
+ abi_long ret;
+
+ ret = get_errno(gettimeofday(&tv, NULL));
+ if (!is_error(ret) && copy_to_user_timeval(arg1, &tv)) {
+ return -TARGET_EFAULT;
+ }
+ return ret;
+}
+
#if defined(TARGET_NR_getxpid) && defined(TARGET_ALPHA)
IMPL(getxpid)
{
@@ -8910,6 +8953,20 @@ IMPL(setrlimit)
return get_errno(setrlimit(resource, &rlim));
}
+IMPL(settimeofday)
+{
+ struct timeval tv;
+ struct timezone tz;
+
+ if (arg1 && copy_from_user_timeval(&tv, arg1)) {
+ return -TARGET_EFAULT;
+ }
+ if (arg2 && copy_from_user_timezone(&tz, arg2)) {
+ return -TARGET_EFAULT;
+ }
+ return get_errno(settimeofday(arg1 ? &tv : NULL, arg2 ? &tz : NULL));
+}
+
IMPL(setsid)
{
return get_errno(setsid());
@@ -9385,62 +9442,6 @@ static abi_long do_syscall1(void *cpu_env, unsigned num,
abi_long arg1,
void *p;
switch(num) {
- case TARGET_NR_getrlimit:
- {
- int resource = target_to_host_resource(arg1);
- struct target_rlimit *target_rlim;
- struct rlimit rlim;
-
- ret = get_errno(getrlimit(resource, &rlim));
- if (!is_error(ret)) {
- if (!lock_user_struct(VERIFY_WRITE, target_rlim, arg2, 0))
- return -TARGET_EFAULT;
- target_rlim->rlim_cur = host_to_target_rlim(rlim.rlim_cur);
- target_rlim->rlim_max = host_to_target_rlim(rlim.rlim_max);
- unlock_user_struct(target_rlim, arg2, 1);
- }
- }
- return ret;
- case TARGET_NR_getrusage:
- {
- struct rusage rusage;
- ret = get_errno(getrusage(arg1, &rusage));
- if (!is_error(ret)) {
- ret = host_to_target_rusage(arg2, &rusage);
- }
- }
- return ret;
- case TARGET_NR_gettimeofday:
- {
- struct timeval tv;
- ret = get_errno(gettimeofday(&tv, NULL));
- if (!is_error(ret)) {
- if (copy_to_user_timeval(arg1, &tv))
- return -TARGET_EFAULT;
- }
- }
- return ret;
- case TARGET_NR_settimeofday:
- {
- struct timeval tv, *ptv = NULL;
- struct timezone tz, *ptz = NULL;
-
- if (arg1) {
- if (copy_from_user_timeval(&tv, arg1)) {
- return -TARGET_EFAULT;
- }
- ptv = &tv;
- }
-
- if (arg2) {
- if (copy_from_user_timezone(&tz, arg2)) {
- return -TARGET_EFAULT;
- }
- ptz = &tz;
- }
-
- return get_errno(settimeofday(ptv, ptz));
- }
#if defined(TARGET_NR_select)
case TARGET_NR_select:
#if defined(TARGET_WANT_NI_OLD_SELECT)
@@ -12737,6 +12738,9 @@ static impl_fn *syscall_table(unsigned num)
#ifdef TARGET_NR_getppid
SYSCALL(getppid);
#endif
+ SYSCALL(getrlimit);
+ SYSCALL(getrusage);
+ SYSCALL(gettimeofday);
#if defined(TARGET_NR_getxpid) && defined(TARGET_ALPHA)
SYSCALL(getxpid);
#endif
@@ -12801,6 +12805,7 @@ static impl_fn *syscall_table(unsigned num)
SYSCALL(sethostname);
SYSCALL(setpgid);
SYSCALL(setrlimit);
+ SYSCALL(settimeofday);
SYSCALL(setsid);
#ifdef TARGET_NR_sigaction
SYSCALL(sigaction);
--
2.17.1
- [Qemu-devel] [PATCH v2 027/108] linux-user: Split out chroot, dup2, dup3, fcntl, setpgid, umask, (continued)
- [Qemu-devel] [PATCH v2 027/108] linux-user: Split out chroot, dup2, dup3, fcntl, setpgid, umask, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 026/108] linux-user: Split out ioctl, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 028/108] linux-user: Split out getpgrp, getppid, setsid, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 029/108] linux-user: Split out rt_sigaction, sigaction, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 030/108] linux-user: Split out rt_sigprocmask, sgetmask, sigprocmask, ssetmask, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 031/108] linux-user: Split out rt_sigpending, rt_sigsuspend, sigpending, sigsuspend, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 032/108] linux-user: Split out rt_sigqueueinfo, rt_sigtimedwait, rt_tgsigqueueinfo, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 033/108] linux-user: Split out rt_sigreturn, sethostname, setrlimit, sigreturn, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 036/108] linux-user: Split out symlink, symlinkat, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 035/108] linux-user: Split out select, pselect6, newselect, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 034/108] linux-user: Split out getrlimit, getrusage, gettimeofday, settimeofday,
Richard Henderson <=
- [Qemu-devel] [PATCH v2 037/108] linux-user: Split out readlink, readlinkat, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 038/108] linux-user: Split out mmap, mmap2, reboot, swapon, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 039/108] linux-user: Split out mprotect, mremap, msync, munmap, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 040/108] linux-user: Split out mlock, mlockall, munlock, munlockall, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 041/108] linux-user: Split out fchmod, fchmodat, ftruncate, truncate, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 042/108] linux-user: Split out fstatfs, fstatfs64, statfs, statfs64, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 043/108] linux-user: Split out getpriority, setpriority, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 044/108] linux-user: Split out socketcall, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 045/108] linux-user: Split out accept, accept4, bind, connect, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 046/108] linux-user: Split out 7 syscalls, Richard Henderson, 2018/06/09