linux-user: fix problems with inotify syscalls
The sys_inotify* calls are defined if the target supports them and the host supports the necessary syscalls. But the syscalls are handled if the target supports them. This situation leads to compilation failures when the host doesn't support the necessary syscalls, as the linker will complain about undefined functions. Fix this state of affairs by making the handling conditions the same as the call definition conditions. Signed-off-by: Nathan Froyd <froydnj@codesourcery.com> Acked-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@7038 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
0dc586b5de
commit
dbfe4c3611
@ -6109,19 +6109,19 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
|
||||
ret = do_futex(arg1, arg2, arg3, arg4, arg5, arg6);
|
||||
break;
|
||||
#endif
|
||||
#ifdef TARGET_NR_inotify_init
|
||||
#if defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)
|
||||
case TARGET_NR_inotify_init:
|
||||
ret = get_errno(sys_inotify_init());
|
||||
break;
|
||||
#endif
|
||||
#ifdef TARGET_NR_inotify_add_watch
|
||||
#if defined(TARGET_NR_inotify_add_watch) && defined(__NR_inotify_add_watch)
|
||||
case TARGET_NR_inotify_add_watch:
|
||||
p = lock_user_string(arg2);
|
||||
ret = get_errno(sys_inotify_add_watch(arg1, path(p), arg3));
|
||||
unlock_user(p, arg2, 0);
|
||||
break;
|
||||
#endif
|
||||
#ifdef TARGET_NR_inotify_rm_watch
|
||||
#if defined(TARGET_NR_inotify_rm_watch) && defined(__NR_inotify_rm_watch)
|
||||
case TARGET_NR_inotify_rm_watch:
|
||||
ret = get_errno(sys_inotify_rm_watch(arg1, arg2));
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user