[Qemu-devel] PATCH: fix undefined function errors

[Sandra Loosemore <sandra@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

I ran into errors about undefined functions when building user-mode QEMU for ARM 
Linux after picking up a recent update from trunk.  The attached patch fixes the 
problem.

As I'm not a QEMU maintainer, someone who is will have to check this in....  or 
some alternate fix for the same problem, maybe.

-Sandra


[-- Attachment #2: qemu.log --]
[-- Type: text/x-log, Size: 287 bytes --]

2008-11-12  Sandra Loosemore  <sandra@codesourcery.com>

	* linux-user/syscall.c (do_syscall):  Make #ifdef on
	TARGET_NR_inotify_init, TARGET_NR_inotify_add_watch, and
	TARGET_NR_inotify_rm_watch cases match that used previously 
	in the file, to avoid references to undefined symbols.

[-- Attachment #3: qemu.patch --]
[-- Type: text/x-patch, Size: 1647 bytes --]

Index: linux-user/syscall.c
===================================================================
*** linux-user/syscall.c	(revision 227507)
--- linux-user/syscall.c	(working copy)
*************** abi_long do_syscall(void *cpu_env, int n
*** 6029,6047 ****
          ret = do_futex(arg1, arg2, arg3, arg4, arg5, arg6);
          break;
  #endif
! #ifdef TARGET_NR_inotify_init
      case TARGET_NR_inotify_init:
          ret = get_errno(sys_inotify_init());
          break;
  #endif
! #ifdef TARGET_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
      case TARGET_NR_inotify_rm_watch:
          ret = get_errno(sys_inotify_rm_watch(arg1, arg2));
          break;
--- 6029,6047 ----
          ret = do_futex(arg1, arg2, arg3, arg4, arg5, arg6);
          break;
  #endif
! #if defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)
      case TARGET_NR_inotify_init:
          ret = get_errno(sys_inotify_init());
          break;
  #endif
! #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
! #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;