[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 70/74] linux-user: Split out symlink, symlinkat
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v7 70/74] linux-user: Split out symlink, symlinkat |
Date: |
Sun, 19 May 2019 13:37:22 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
linux-user/syscall-defs.h | 4 ++++
linux-user/strace.c | 27 ---------------------------
linux-user/syscall-file.inc.c | 28 ++++++++++++++++++++++++++++
linux-user/syscall.c | 30 ------------------------------
linux-user/strace.list | 6 ------
5 files changed, 32 insertions(+), 63 deletions(-)
diff --git a/linux-user/syscall-defs.h b/linux-user/syscall-defs.h
index c179f69d9f..5625c268c3 100644
--- a/linux-user/syscall-defs.h
+++ b/linux-user/syscall-defs.h
@@ -279,6 +279,10 @@ SYSCALL_DEF(ssetmask, ARG_HEX);
#ifdef TARGET_NR_stime
SYSCALL_DEF(stime, ARG_PTR);
#endif
+#ifdef TARGET_NR_symlink
+SYSCALL_DEF(symlink, ARG_STR, ARG_STR);
+#endif
+SYSCALL_DEF(symlinkat, ARG_STR, ARG_ATDIRFD, ARG_STR);
SYSCALL_DEF(sync);
SYSCALL_DEF(syncfs, ARG_DEC);
#ifdef TARGET_NR_time
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 669eca7fa6..97755458d3 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -1563,33 +1563,6 @@ print_statfs64(const struct syscallname *name,
}
#endif
-#ifdef TARGET_NR_symlink
-static void
-print_symlink(const struct syscallname *name,
- abi_long arg0, abi_long arg1, abi_long arg2,
- abi_long arg3, abi_long arg4, abi_long arg5)
-{
- print_syscall_prologue(name);
- print_string(arg0, 0);
- print_string(arg1, 1);
- print_syscall_epilogue(name);
-}
-#endif
-
-#ifdef TARGET_NR_symlinkat
-static void
-print_symlinkat(const struct syscallname *name,
- abi_long arg0, abi_long arg1, abi_long arg2,
- abi_long arg3, abi_long arg4, abi_long arg5)
-{
- print_syscall_prologue(name);
- print_string(arg0, 0);
- print_at_dirfd(arg1, 0);
- print_string(arg2, 1);
- print_syscall_epilogue(name);
-}
-#endif
-
#ifdef TARGET_NR_utimensat
static void
print_utimensat(const struct syscallname *name,
diff --git a/linux-user/syscall-file.inc.c b/linux-user/syscall-file.inc.c
index 0a25d39d28..e3749f0fb4 100644
--- a/linux-user/syscall-file.inc.c
+++ b/linux-user/syscall-file.inc.c
@@ -1254,6 +1254,34 @@ SYSCALL_IMPL(select)
}
#endif
+static abi_long do_symlinkat(abi_ulong guest_target, int dirfd,
+ abi_ulong guest_path)
+{
+ char *target = lock_user_string(guest_target);
+ char *path = lock_user_string(guest_path);
+ abi_long ret = -TARGET_EFAULT;
+
+ if (target && path) {
+ ret = get_errno(symlinkat(target, dirfd, path));
+ }
+ unlock_user(path, guest_path, 0);
+ unlock_user(target, guest_target, 0);
+
+ return ret;
+}
+
+#ifdef TARGET_NR_symlink
+SYSCALL_IMPL(symlink)
+{
+ return do_symlinkat(arg1, AT_FDCWD, arg2);
+}
+#endif
+
+SYSCALL_IMPL(symlinkat)
+{
+ return do_symlinkat(arg1, arg2, arg3);
+}
+
SYSCALL_IMPL(sync)
{
sync();
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 6355fd62d8..fccf9ee184 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4158,36 +4158,6 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
void *p;
switch(num) {
-#ifdef TARGET_NR_symlink
- case TARGET_NR_symlink:
- {
- void *p2;
- p = lock_user_string(arg1);
- p2 = lock_user_string(arg2);
- if (!p || !p2)
- ret = -TARGET_EFAULT;
- else
- ret = get_errno(symlink(p, p2));
- unlock_user(p2, arg2, 0);
- unlock_user(p, arg1, 0);
- }
- return ret;
-#endif
-#if defined(TARGET_NR_symlinkat)
- case TARGET_NR_symlinkat:
- {
- void *p2;
- p = lock_user_string(arg1);
- p2 = lock_user_string(arg3);
- if (!p || !p2)
- ret = -TARGET_EFAULT;
- else
- ret = get_errno(symlinkat(p, arg2, p2));
- unlock_user(p2, arg3, 0);
- unlock_user(p, arg1, 0);
- }
- return ret;
-#endif
#ifdef TARGET_NR_swapon
case TARGET_NR_swapon:
if (!(p = lock_user_string(arg1)))
diff --git a/linux-user/strace.list b/linux-user/strace.list
index 1bb9224b5e..d9db80335d 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -1122,12 +1122,6 @@
#ifdef TARGET_NR_swapon
{ TARGET_NR_swapon, "swapon" , NULL, NULL, NULL },
#endif
-#ifdef TARGET_NR_symlink
-{ TARGET_NR_symlink, "symlink" , NULL, print_symlink, NULL },
-#endif
-#ifdef TARGET_NR_symlinkat
-{ TARGET_NR_symlinkat, "symlinkat", NULL, print_symlinkat, NULL },
-#endif
#ifdef TARGET_NR_syscall
{ TARGET_NR_syscall, "syscall" , NULL, NULL, NULL },
#endif
--
2.17.1
- [Qemu-devel] [PATCH v7 64/74] linux-user: Split out gethostname, sethostname, (continued)
- [Qemu-devel] [PATCH v7 64/74] linux-user: Split out gethostname, sethostname, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH v7 65/74] linux-user: Split out getrlimit, setrlimit, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH v7 61/74] linux-user: Split out rt_sigtimedwait, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH v7 62/74] linux-user: Split out rt_sigqueueinfo, rt_tgsigqueueinfo, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH v7 63/74] linux-user: Split out sigreturn, rt_sigreturn, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH v7 66/74] linux-user: Split out getrusage, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH v7 67/74] linux-user: Split out gettimeofday, settimeofday, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH v7 69/74] linux-user: Split out pselect6, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH v7 68/74] linux-user: Split out select, _newselect, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH v7 70/74] linux-user: Split out symlink, symlinkat,
Richard Henderson <=
- [Qemu-devel] [PATCH v7 71/74] linux-user: Split out swapon, swapoff, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH v7 72/74] linux-user: Split out reboot, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH v7 73/74] linux-user: Split out truncate, truncate64, ftruncate, ftruncate64, Richard Henderson, 2019/05/19
- [Qemu-devel] [PATCH v7 74/74] linux-user: Split out getpriority, setpriority, Richard Henderson, 2019/05/19
- Re: [Qemu-devel] [PATCH v7 00/74] linux-user: Split do_syscall, Laurent Vivier, 2019/05/20
- Re: [Qemu-devel] [PATCH v7 00/74] linux-user: Split do_syscall, Peter Maydell, 2019/05/20
- Re: [Qemu-devel] [PATCH v7 00/74] linux-user: Split do_syscall, Aleksandar Markovic, 2019/05/22