[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/33] linux-user: Split out dup, mkdir, mkdirat, rm
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 25/33] linux-user: Split out dup, mkdir, mkdirat, rmdir |
Date: |
Fri, 1 Jun 2018 00:30:42 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
linux-user/syscall.c | 109 +++++++++++++++++++++++++++++--------------
1 file changed, 73 insertions(+), 36 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 24514329b0..36092d753d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7977,6 +7977,20 @@ IMPL(creat)
}
#endif
+IMPL(dup)
+{
+ abi_long ret;
+
+ if (is_hostfd(arg1)) {
+ return -TARGET_EBADF;
+ }
+ ret = get_errno(dup(arg1));
+ if (ret >= 0) {
+ fd_trans_dup(arg1, ret);
+ }
+ return ret;
+}
+
IMPL(execve)
{
abi_ulong *guest_ptrs;
@@ -8249,6 +8263,40 @@ IMPL(lseek)
return get_errno(lseek(arg1, arg2, arg3));
}
+#ifdef TARGET_NR_mkdir
+IMPL(mkdir)
+{
+ char *p = lock_user_string(arg1);
+ abi_long ret;
+
+ if (!p) {
+ return -TARGET_EFAULT;
+ }
+ ret = get_errno(mkdir(p, arg2));
+ unlock_user(p, arg1, 0);
+ return ret;
+}
+#endif
+
+#ifdef TARGET_NR_mkdirat
+IMPL(mkdirat)
+{
+ char *p;
+ abi_long ret;
+
+ if (is_hostfd(arg1)) {
+ return -TARGET_EBADF;
+ }
+ p = lock_user_string(arg2);
+ if (!p) {
+ return -TARGET_EFAULT;
+ }
+ ret = get_errno(mkdirat(arg1, p, arg3));
+ unlock_user(p, arg2, 0);
+ return ret;
+}
+#endif
+
#ifdef TARGET_NR_mknod
IMPL(mknod)
{
@@ -8558,6 +8606,21 @@ IMPL(renameat2)
}
#endif
+#ifdef TARGET_NR_rmdir
+IMPL(rmdir)
+{
+ char *p = lock_user_string(arg1);
+ abi_long ret;
+
+ if (!p) {
+ return -TARGET_EFAULT;
+ }
+ ret = get_errno(rmdir(p));
+ unlock_user(p, arg1, 0);
+ return ret;
+}
+#endif
+
#ifdef TARGET_NR_stime
IMPL(stime)
{
@@ -8768,42 +8831,6 @@ IMPL(everything_else)
char *fn;
switch(num) {
-#ifdef TARGET_NR_mkdir
- case TARGET_NR_mkdir:
- if (!(p = lock_user_string(arg1)))
- return -TARGET_EFAULT;
- ret = get_errno(mkdir(p, arg2));
- unlock_user(p, arg1, 0);
- return ret;
-#endif
-#if defined(TARGET_NR_mkdirat)
- case TARGET_NR_mkdirat:
- if (is_hostfd(arg1)) {
- return -TARGET_EBADF;
- }
- if (!(p = lock_user_string(arg2)))
- return -TARGET_EFAULT;
- ret = get_errno(mkdirat(arg1, p, arg3));
- unlock_user(p, arg2, 0);
- return ret;
-#endif
-#ifdef TARGET_NR_rmdir
- case TARGET_NR_rmdir:
- if (!(p = lock_user_string(arg1)))
- return -TARGET_EFAULT;
- ret = get_errno(rmdir(p));
- unlock_user(p, arg1, 0);
- return ret;
-#endif
- case TARGET_NR_dup:
- if (is_hostfd(arg1)) {
- return -TARGET_EBADF;
- }
- ret = get_errno(dup(arg1));
- if (ret >= 0) {
- fd_trans_dup(arg1, ret);
- }
- return ret;
#ifdef TARGET_NR_pipe
case TARGET_NR_pipe:
return do_pipe(cpu_env, arg1, 0, 0);
@@ -12922,6 +12949,7 @@ static impl_fn * const syscall_table[] = {
#ifdef TARGET_NR_creat
[TARGET_NR_creat] = impl_creat,
#endif
+ [TARGET_NR_dup] = impl_dup,
[TARGET_NR_execve] = impl_execve,
[TARGET_NR_exit] = impl_exit,
#ifdef TARGET_NR_faccessat
@@ -12947,6 +12975,12 @@ static impl_fn * const syscall_table[] = {
[TARGET_NR_linkat] = impl_linkat,
#endif
[TARGET_NR_lseek] = impl_lseek,
+#ifdef TARGET_NR_mkdir
+ [TARGET_NR_mkdir] = impl_mkdir,
+#endif
+#ifdef TARGET_NR_mkdirat
+ [TARGET_NR_mkdirat] = impl_mkdirat,
+#endif
#ifdef TARGET_NR_mknod
[TARGET_NR_mknod] = impl_mknod,
#endif
@@ -12980,6 +13014,9 @@ static impl_fn * const syscall_table[] = {
#ifdef TARGET_NR_renameat2
[TARGET_NR_renameat2] = impl_renameat2,
#endif
+#ifdef TARGET_NR_rmdir
+ [TARGET_NR_rmdir] = impl_rmdir,
+#endif
#ifdef TARGET_NR_stime
[TARGET_NR_stime] = impl_stime,
#endif
--
2.17.0
- [Qemu-devel] [PATCH 13/33] linux-user: Split out name_to_handle_at, (continued)
- [Qemu-devel] [PATCH 13/33] linux-user: Split out name_to_handle_at, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 16/33] linux-user: Split out link, linkat, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 17/33] linux-user: Split out unlink, unlinkat, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 18/33] linux-user: Split out chdir, mknod, mknodat, time, chmod, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 19/33] linux-user: Remove all unimplemented entries, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 20/33] linux-user: Split out getpid, getxpid, lseek, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 21/33] linux-user: Split out mount, umount, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 22/33] linux-user: Split out alarm, pause, stime, utime, utimes, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 23/33] linux-user: Split out access, faccessat, futimesat, kill, nice, sync, syncfs, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 26/33] linux-user: Split out acct, pipe, pipe2, times, umount2, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 25/33] linux-user: Split out dup, mkdir, mkdirat, rmdir,
Richard Henderson <=
- [Qemu-devel] [PATCH 24/33] linux-user: Split out rename, renameat, renameat2, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 27/33] linux-user: Split out ioctl, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 28/33] linux-user: Split out chroot, dup2, dup3, fcntl, setpgid, umask, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 29/33] linux-user: Split out getpgrp, getppid, setsid, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 32/33] linux-user: Split out rt_sigpending, rt_sigsuspend, sigpending, sigsuspend, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 31/33] linux-user: Split out rt_sigprocmask, sgetmask, sigprocmask, ssetmask, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 30/33] linux-user: Split out rt_sigaction, sigaction, Richard Henderson, 2018/06/01
- [Qemu-devel] [PATCH 33/33] linux-user: Split out rt_sigqueueinfo, rt_sigtimedwait, rt_tgsigqueueinfo, Richard Henderson, 2018/06/01
- Re: [Qemu-devel] [PATCH 00/33] linux-user: Begin splitting do_syscall, Richard Henderson, 2018/06/01
- Re: [Qemu-devel] [PATCH 00/33] linux-user: Begin splitting do_syscall, no-reply, 2018/06/01
- Prev by Date:
[Qemu-devel] [PATCH 26/33] linux-user: Split out acct, pipe, pipe2, times, umount2
- Next by Date:
[Qemu-devel] [PATCH 24/33] linux-user: Split out rename, renameat, renameat2
- Previous by thread:
[Qemu-devel] [PATCH 26/33] linux-user: Split out acct, pipe, pipe2, times, umount2
- Next by thread:
[Qemu-devel] [PATCH 24/33] linux-user: Split out rename, renameat, renameat2
- Index(es):