motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 09:43:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

fcntl64 fix, by Kirill A. Shutemov.

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2517 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-03-20 21:50:52 +00:00
parent dc3c9d213d
commit b1e341ebb7
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
linux-user/syscall.c
View file

@ -3872,15 +3872,27 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
#if TARGET_LONG_BITS == 32 #if TARGET_LONG_BITS == 32
case TARGET_NR_fcntl64: case TARGET_NR_fcntl64:
{ {
int cmd;
struct flock64 fl; struct flock64 fl;
struct target_flock64 *target_fl; struct target_flock64 *target_fl;
#ifdef TARGET_ARM #ifdef TARGET_ARM
struct target_eabi_flock64 *target_efl; struct target_eabi_flock64 *target_efl;
#endif #endif
switch(arg2){
case TARGET_F_GETLK64:
cmd = F_GETLK64;
case TARGET_F_SETLK64:
cmd = F_SETLK64;
case TARGET_F_SETLKW64:
cmd = F_SETLK64;
default:
cmd = arg2;
}
switch(arg2) { switch(arg2) {
case F_GETLK64: case TARGET_F_GETLK64:
ret = get_errno(fcntl(arg1, arg2, &fl)); ret = get_errno(fcntl(arg1, cmd, &fl));
if (ret == 0) { if (ret == 0) {
#ifdef TARGET_ARM #ifdef TARGET_ARM
if (((CPUARMState *)cpu_env)->eabi) { if (((CPUARMState *)cpu_env)->eabi) {
@ -3905,8 +3917,8 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
} }
break; break;
case F_SETLK64: case TARGET_F_SETLK64:
case F_SETLKW64: case TARGET_F_SETLKW64:
#ifdef TARGET_ARM #ifdef TARGET_ARM
if (((CPUARMState *)cpu_env)->eabi) { if (((CPUARMState *)cpu_env)->eabi) {
lock_user_struct(target_efl, arg3, 1); lock_user_struct(target_efl, arg3, 1);
@ -3927,10 +3939,10 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
fl.l_pid = tswapl(target_fl->l_pid); fl.l_pid = tswapl(target_fl->l_pid);
unlock_user_struct(target_fl, arg3, 0); unlock_user_struct(target_fl, arg3, 0);
} }
ret = get_errno(fcntl(arg1, arg2, &fl)); ret = get_errno(fcntl(arg1, cmd, &fl));
break; break;
default: default:
ret = get_errno(do_fcntl(arg1, arg2, arg3)); ret = get_errno(do_fcntl(arg1, cmd, arg3));
break; break;
} }
break; break;