From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KpKN5-0003yO-U5 for qemu-devel@nongnu.org; Mon, 13 Oct 2008 06:09:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KpKN4-0003y6-WB for qemu-devel@nongnu.org; Mon, 13 Oct 2008 06:09:51 -0400 Received: from [199.232.76.173] (port=47860 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KpKN4-0003xy-LE for qemu-devel@nongnu.org; Mon, 13 Oct 2008 06:09:50 -0400 Received: from ug-out-1314.google.com ([66.249.92.173]:59694) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KpKN4-000777-8e for qemu-devel@nongnu.org; Mon, 13 Oct 2008 06:09:50 -0400 Received: by ug-out-1314.google.com with SMTP id j3so435911ugf.36 for ; Mon, 13 Oct 2008 03:09:49 -0700 (PDT) From: "Kirill A. Shutemov" Date: Mon, 13 Oct 2008 13:10:36 +0300 Message-Id: <1223892640-15545-9-git-send-email-kirill@shutemov.name> In-Reply-To: <1223892640-15545-8-git-send-email-kirill@shutemov.name> References: <1223892640-15545-1-git-send-email-kirill@shutemov.name> <1223892640-15545-2-git-send-email-kirill@shutemov.name> <1223892640-15545-3-git-send-email-kirill@shutemov.name> <1223892640-15545-4-git-send-email-kirill@shutemov.name> <1223892640-15545-5-git-send-email-kirill@shutemov.name> <1223892640-15545-6-git-send-email-kirill@shutemov.name> <1223892640-15545-7-git-send-email-kirill@shutemov.name> <1223892640-15545-8-git-send-email-kirill@shutemov.name> Subject: [Qemu-devel] [PATCH] Fix fstatat64()/newfstatat() syscall implementation Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Kirill A. Shutemov" , Paul Brook There are two different syscall names for the same goal. On systems with sizeof(long) == 64 it calls newfstatat. On systems with sizeof(long) == 32 it calls fstatat64. Signed-off-by: Kirill A. Shutemov --- linux-user/syscall.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index c85fea4..3fa205f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -165,6 +165,7 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \ #define __NR_sys_linkat __NR_linkat #define __NR_sys_mkdirat __NR_mkdirat #define __NR_sys_mknodat __NR_mknodat +#define __NR_sys_newfstatat __NR_newfstatat #define __NR_sys_openat __NR_openat #define __NR_sys_readlinkat __NR_readlinkat #define __NR_sys_renameat __NR_renameat @@ -205,7 +206,8 @@ _syscall4(int,sys_fchmodat,int,dirfd,const char *,pathname, _syscall5(int,sys_fchownat,int,dirfd,const char *,pathname, uid_t,owner,gid_t,group,int,flags) #endif -#if defined(TARGET_NR_fstatat64) && defined(__NR_fstatat64) +#if (defined(TARGET_NR_fstatat64) || defined(TARGET_NR_newfstatat)) && \ + defined(__NR_fstatat64) _syscall4(int,sys_fstatat64,int,dirfd,const char *,pathname, struct stat *,buf,int,flags) #endif @@ -236,6 +238,11 @@ _syscall3(int,sys_mkdirat,int,dirfd,const char *,pathname,mode_t,mode) _syscall4(int,sys_mknodat,int,dirfd,const char *,pathname, mode_t,mode,dev_t,dev) #endif +#if (defined(TARGET_NR_newfstatat) || defined(TARGET_NR_fstatat64) ) && \ + defined(__NR_newfstatat) +_syscall4(int,sys_newfstatat,int,dirfd,const char *,pathname, + struct stat *,buf,int,flags) +#endif #if defined(TARGET_NR_openat) && defined(__NR_openat) _syscall4(int,sys_openat,int,dirfd,const char *,pathname,int,flags,mode_t,mode) #endif @@ -3481,7 +3488,7 @@ static inline abi_long host_to_target_timespec(abi_ulong target_addr, return 0; } -#ifdef TARGET_NR_stat64 +#if defined(TARGET_NR_stat64) || defined(TARGET_NR_newfstatat) static inline abi_long host_to_target_stat64(void *cpu_env, abi_ulong target_addr, struct stat *host_st) @@ -3513,11 +3520,15 @@ static inline abi_long host_to_target_stat64(void *cpu_env, } else #endif { +#if TARGET_LONG_BITS == 64 + struct target_stat *target_st; +#else struct target_stat64 *target_st; +#endif if (!lock_user_struct(VERIFY_WRITE, target_st, target_addr, 0)) return -TARGET_EFAULT; - memset(target_st, 0, sizeof(struct target_stat64)); + memset(target_st, 0, sizeof(*target_st)); __put_user(host_st->st_dev, &target_st->st_dev); __put_user(host_st->st_ino, &target_st->st_ino); #ifdef TARGET_STAT64_HAS_BROKEN_ST_INO @@ -5645,11 +5656,21 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ret = host_to_target_stat64(cpu_env, arg2, &st); break; #endif -#if defined(TARGET_NR_fstatat64) && defined(__NR_fstatat64) +#if (defined(TARGET_NR_fstatat64) || defined(TARGET_NR_newfstatat)) && \ + (defined(__NR_fstatat64) || defined(__NR_newfstatat)) +#ifdef TARGET_NR_fstatat64 case TARGET_NR_fstatat64: +#endif +#ifdef TARGET_NR_newfstatat + case TARGET_NR_newfstatat: +#endif if (!(p = lock_user_string(arg2))) goto efault; +#ifdef __NR_fstatat64 ret = get_errno(sys_fstatat64(arg1, path(p), &st, arg4)); +#else + ret = get_errno(sys_newfstatat(arg1, path(p), &st, arg4)); +#endif if (!is_error(ret)) ret = host_to_target_stat64(cpu_env, arg3, &st); break; -- 1.5.6.5.GIT