From patchwork Fri Oct 12 18:24:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [5/5] linux-user: do_openat wrapper added From: riku.voipio@linaro.org X-Patchwork-Id: 191171 Message-Id: To: qemu-devel@nongnu.org Cc: Riku Voipio Date: Fri, 12 Oct 2012 21:24:42 +0300 From: Riku Voipio In preparations for for refactoring the main switch/case out Signed-off-by: Riku Voipio --- linux-user/syscall.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index eebf219..61030f2 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5092,6 +5092,19 @@ cleanup: unlock_user(pathname, arg1, 0); return ret; } + +static int do_openat(void *cpu_env, abi_long arg1, abi_long arg2, abi_long arg3, abi_long arg4) +{ + void *p; + int ret; + if (!(p = lock_user_string(arg2))) + return -EFAULT; + ret = sys_openat(arg1, path(p), + target_to_host_bitmask(arg3, fcntl_flags_tbl), arg4); + unlock_user(p, arg2, 0); + return ret; +} + static void do_exit(void *, abi_long) __attribute__ ((noreturn)); static void do_exit(void *cpu_env, abi_long arg1) { @@ -5199,13 +5212,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, break; #if defined(TARGET_NR_openat) && defined(__NR_openat) case TARGET_NR_openat: - if (!(p = lock_user_string(arg2))) - goto efault; - ret = get_errno(sys_openat(arg1, - path(p), - target_to_host_bitmask(arg3, fcntl_flags_tbl), - arg4)); - unlock_user(p, arg2, 0); + ret = get_errno(do_openat(cpu_env, arg1, arg2, arg3, arg4)); break; #endif case TARGET_NR_close: