From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KneAq-0004VX-9Y for qemu-devel@nongnu.org; Wed, 08 Oct 2008 14:54:16 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KneAl-0004Tp-FW for qemu-devel@nongnu.org; Wed, 08 Oct 2008 14:54:14 -0400 Received: from [199.232.76.173] (port=54491 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KneAl-0004Tj-11 for qemu-devel@nongnu.org; Wed, 08 Oct 2008 14:54:11 -0400 Received: from nf-out-0910.google.com ([64.233.182.189]:14572) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KneAk-0006s3-IS for qemu-devel@nongnu.org; Wed, 08 Oct 2008 14:54:10 -0400 Received: by nf-out-0910.google.com with SMTP id b2so1797248nfb.12 for ; Wed, 08 Oct 2008 11:54:10 -0700 (PDT) From: "Kirill A. Shutemov" Date: Wed, 8 Oct 2008 21:54:33 +0300 Message-Id: <1223492074-5677-9-git-send-email-kirill@shutemov.name> In-Reply-To: <1223492074-5677-8-git-send-email-kirill@shutemov.name> References: <1223492074-5677-1-git-send-email-kirill@shutemov.name> <1223492074-5677-2-git-send-email-kirill@shutemov.name> <1223492074-5677-3-git-send-email-kirill@shutemov.name> <1223492074-5677-4-git-send-email-kirill@shutemov.name> <1223492074-5677-5-git-send-email-kirill@shutemov.name> <1223492074-5677-6-git-send-email-kirill@shutemov.name> <1223492074-5677-7-git-send-email-kirill@shutemov.name> <1223492074-5677-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" 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 | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 5b69b5d..6e55a74 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 @@ -5645,11 +5652,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_fstatat64: +#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