From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NxQRF-0004Yw-Ep
	for qemu-devel@nongnu.org; Thu, 01 Apr 2010 15:52:25 -0400
Received: from [140.186.70.92] (port=49695 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NxQRE-0004VX-6F
	for qemu-devel@nongnu.org; Thu, 01 Apr 2010 15:52:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <aurelien@aurel32.net>) id 1NxQRC-0001EO-0d
	for qemu-devel@nongnu.org; Thu, 01 Apr 2010 15:52:24 -0400
Received: from hall.aurel32.net ([88.191.82.174]:57183)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <aurelien@aurel32.net>) id 1NxQRB-0001E5-QY
	for qemu-devel@nongnu.org; Thu, 01 Apr 2010 15:52:21 -0400
Date: Thu, 1 Apr 2010 21:52:20 +0200
From: Aurelien Jarno <aurelien@aurel32.net>
Subject: Re: [Qemu-devel] [PATCH] Fix compilation with missing inotify_init1
Message-ID: <20100401195220.GC19306@hall.aurel32.net>
References: <1269769481-7438-1-git-send-email-weil@mail.berlios.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <1269769481-7438-1-git-send-email-weil@mail.berlios.de>
Sender: Aurelien Jarno <aurelien@aurel32.net>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Weil <weil@mail.berlios.de>
Cc: Riku Voipio <riku.voipio@nokia.com>, QEMU Developers <qemu-devel@nongnu.org>

On Sun, Mar 28, 2010 at 11:44:41AM +0200, Stefan Weil wrote:
> Commit c05c7a7306a23a4b01d1606172b142c45caffc92
> breaks cross compilation for mips (and other
> compilations without CONFIG_INOTIFY1):
> 
> make[1]: Entering directory `/qemu/bin/mips'
>   CC    i386-linux-user/syscall.o
> cc1: warnings being treated as errors
> /qemu/linux-user/syscall.c: In function ‘do_syscall’:
> /qemu/linux-user/syscall.c:7067: error: implicit declaration of function ‘sys_inotify_init1’
> 
> Cc: Riku Voipio <riku.voipio@nokia.com>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>

Thanks, applied.

> ---
>  linux-user/syscall.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 29c9c09..aa3cbb8 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -7062,11 +7062,13 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
>          ret = get_errno(sys_inotify_init());
>          break;
>  #endif
> +#ifdef CONFIG_INOTIFY1
>  #if defined(TARGET_NR_inotify_init1) && defined(__NR_inotify_init1)
>      case TARGET_NR_inotify_init1:
>          ret = get_errno(sys_inotify_init1(arg1));
>          break;
>  #endif
> +#endif
>  #if defined(TARGET_NR_inotify_add_watch) && defined(__NR_inotify_add_watch)
>      case TARGET_NR_inotify_add_watch:
>          p = lock_user_string(arg2);
> -- 
> 1.7.0
> 
> 
> 
> 

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net