mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

alpha-linux-user: Fix umount syscall numbers

Browse Source 
It has been pointed out on LKML that the alpha umount syscall numbers
are named wrong, and a patch to rectify that has been posted for 3.11.

Glibc works around this by treating NR_umount as NR_umount2 if
NR_oldumount exists.  That's more complicated than we need in QEMU,
given that we control linux-user/*/syscall_nr.h.

This is the last instance of TARGET_NR_oldumount, so delete that from
the strace.list.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Richard Henderson 2013-07-24 09:50:00 -10:00 committed by Riku Voipio
parent f828a4c8fa
commit 8070e7be8b
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux-user/alpha/syscall_nr.h
View File

@ -20,7 +20,7 @@
#define TARGET_NR_lseek 19 #define TARGET_NR_lseek 19
#define TARGET_NR_getxpid 20 #define TARGET_NR_getxpid 20
#define TARGET_NR_osf_mount 21 #define TARGET_NR_osf_mount 21
#define TARGET_NR_umount 22 #define TARGET_NR_umount2 22
#define TARGET_NR_setuid 23 #define TARGET_NR_setuid 23
#define TARGET_NR_getxuid 24 #define TARGET_NR_getxuid 24
#define TARGET_NR_exec_with_loader 25 /* not implemented */ #define TARGET_NR_exec_with_loader 25 /* not implemented */
@ -255,7 +255,7 @@
#define TARGET_NR_sysinfo 318 #define TARGET_NR_sysinfo 318
#define TARGET_NR__sysctl 319 #define TARGET_NR__sysctl 319
/* 320 was sys_idle. */ /* 320 was sys_idle. */
#define TARGET_NR_oldumount 321 #define TARGET_NR_umount 321
#define TARGET_NR_swapon 322 #define TARGET_NR_swapon 322
#define TARGET_NR_times 323 #define TARGET_NR_times 323
#define TARGET_NR_personality 324 #define TARGET_NR_personality 324

3
linux-user/strace.list
View File

@ -612,9 +612,6 @@
#ifdef TARGET_NR_oldstat #ifdef TARGET_NR_oldstat
{ TARGET_NR_oldstat, "oldstat" , NULL, NULL, NULL }, { TARGET_NR_oldstat, "oldstat" , NULL, NULL, NULL },
#endif #endif
#ifdef TARGET_NR_oldumount
{ TARGET_NR_oldumount, "oldumount" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_olduname #ifdef TARGET_NR_olduname
{ TARGET_NR_olduname, "olduname" , NULL, NULL, NULL }, { TARGET_NR_olduname, "olduname" , NULL, NULL, NULL },
#endif #endif

2
linux-user/syscall.c
View File

@ -5697,7 +5697,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
} }
break; break;
#ifdef TARGET_NR_umount2 /* not on alpha */ #ifdef TARGET_NR_umount2
case TARGET_NR_umount2: case TARGET_NR_umount2:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;