proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-06 22:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux-user: fix fstatat64()/newfstatat() syscall implementation

Browse Source 
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 <kirill@shutemov.name>
Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7050 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2009-04-08 23:07:05 +00:00
parent f1afe02aef
commit 9d33b76b20
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
linux-user/syscall.c
View File

@ -169,6 +169,7 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \
#define __NR_sys_linkat __NR_linkat #define __NR_sys_linkat __NR_linkat
#define __NR_sys_mkdirat __NR_mkdirat #define __NR_sys_mkdirat __NR_mkdirat
#define __NR_sys_mknodat __NR_mknodat #define __NR_sys_mknodat __NR_mknodat
#define __NR_sys_newfstatat __NR_newfstatat
#define __NR_sys_openat __NR_openat #define __NR_sys_openat __NR_openat
#define __NR_sys_readlinkat __NR_readlinkat #define __NR_sys_readlinkat __NR_readlinkat
#define __NR_sys_renameat __NR_renameat #define __NR_sys_renameat __NR_renameat
@ -209,7 +210,8 @@ _syscall4(int,sys_fchmodat,int,dirfd,const char *,pathname,
_syscall5(int,sys_fchownat,int,dirfd,const char *,pathname, _syscall5(int,sys_fchownat,int,dirfd,const char *,pathname,
uid_t,owner,gid_t,group,int,flags) uid_t,owner,gid_t,group,int,flags)
#endif #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, _syscall4(int,sys_fstatat64,int,dirfd,const char *,pathname,
struct stat *,buf,int,flags) struct stat *,buf,int,flags)
#endif #endif
@ -240,6 +242,11 @@ _syscall3(int,sys_mkdirat,int,dirfd,const char *,pathname,mode_t,mode)
_syscall4(int,sys_mknodat,int,dirfd,const char *,pathname, _syscall4(int,sys_mknodat,int,dirfd,const char *,pathname,
mode_t,mode,dev_t,dev) mode_t,mode,dev_t,dev)
#endif #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) #if defined(TARGET_NR_openat) && defined(__NR_openat)
_syscall4(int,sys_openat,int,dirfd,const char *,pathname,int,flags,mode_t,mode) _syscall4(int,sys_openat,int,dirfd,const char *,pathname,int,flags,mode_t,mode)
#endif #endif
@ -3280,7 +3287,7 @@ static inline abi_long host_to_target_timespec(abi_ulong target_addr,
return 0; 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, static inline abi_long host_to_target_stat64(void *cpu_env,
abi_ulong target_addr, abi_ulong target_addr,
struct stat *host_st) struct stat *host_st)
@ -3312,11 +3319,15 @@ static inline abi_long host_to_target_stat64(void *cpu_env,
} else } else
#endif #endif
{ {
#if TARGET_LONG_BITS == 64
struct target_stat *target_st;
#else
struct target_stat64 *target_st; struct target_stat64 *target_st;
#endif
if (!lock_user_struct(VERIFY_WRITE, target_st, target_addr, 0)) if (!lock_user_struct(VERIFY_WRITE, target_st, target_addr, 0))
return -TARGET_EFAULT; 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_dev, &target_st->st_dev);
__put_user(host_st->st_ino, &target_st->st_ino); __put_user(host_st->st_ino, &target_st->st_ino);
#ifdef TARGET_STAT64_HAS_BROKEN_ST_INO #ifdef TARGET_STAT64_HAS_BROKEN_ST_INO
@ -5459,11 +5470,21 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
ret = host_to_target_stat64(cpu_env, arg2, &st); ret = host_to_target_stat64(cpu_env, arg2, &st);
break; break;
#endif #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: case TARGET_NR_fstatat64:
#endif
#ifdef TARGET_NR_newfstatat
case TARGET_NR_newfstatat:
#endif
if (!(p = lock_user_string(arg2))) if (!(p = lock_user_string(arg2)))
goto efault; goto efault;
#ifdef __NR_fstatat64
ret = get_errno(sys_fstatat64(arg1, path(p), &st, arg4)); 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)) if (!is_error(ret))
ret = host_to_target_stat64(cpu_env, arg3, &st); ret = host_to_target_stat64(cpu_env, arg3, &st);
break; break;