From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MTME2-0007Pa-9N
	for qemu-devel@nongnu.org; Tue, 21 Jul 2009 16:46:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MTME0-0007Ou-Li
	for qemu-devel@nongnu.org; Tue, 21 Jul 2009 16:46:13 -0400
Received: from [199.232.76.173] (port=41720 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MTME0-0007Oq-Hd
	for qemu-devel@nongnu.org; Tue, 21 Jul 2009 16:46:12 -0400
Received: from naru.obs2.net ([84.20.150.76]:57410)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <nchip@kos.to>) id 1MTME0-0005OT-0d
	for qemu-devel@nongnu.org; Tue, 21 Jul 2009 16:46:12 -0400
Date: Tue, 21 Jul 2009 23:46:08 +0300
From: Riku Voipio <riku.voipio@iki.fi>
Subject: Re: [Qemu-devel] [PATCH] linux-user: fix mq_* compilation problems
Message-ID: <20090721204608.GA9729@kos.to>
References: <1248185715-25354-1-git-send-email-froydnj@codesourcery.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1248185715-25354-1-git-send-email-froydnj@codesourcery.com>
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: Nathan Froyd <froydnj@codesourcery.com>
Cc: qemu-devel@nongnu.org

On Tue, Jul 21, 2009 at 07:15:15AM -0700, Nathan Froyd wrote:
> mqueue.h is only available if __NR_mq_open is defined.  So don't include
> it unconditionally.  Similarly, the mq_* family of syscalls depend on
> __NR_mq_open.  Finally, the copy_{from,to}_user_mq_attr functions should
> not be defined unconditionally, but only if we're going to use the mq_*
> syscalls.

Looks fine to me. I'll include in my next batch for pulling if nobody
commits it before.

Acked-By: Riku Voipio <riku.voipio@iki.fi>

> ---
>  linux-user/syscall.c |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 7b57323..c9276f6 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -28,7 +28,6 @@
>  #include <fcntl.h>
>  #include <time.h>
>  #include <limits.h>
> -#include <mqueue.h>
>  #include <sys/types.h>
>  #include <sys/ipc.h>
>  #include <sys/msg.h>
> @@ -847,6 +846,9 @@ static inline abi_long copy_to_user_timeval(abi_ulong target_tv_addr,
>      return 0;
>  }
>  
> +#if defined(TARGET_NR_mq_open) && defined(__NR_mq_open)
> +#include <mqueue.h>
> +
>  static inline abi_long copy_from_user_mq_attr(struct mq_attr *attr,
>                                                abi_ulong target_mq_attr_addr)
>  {
> @@ -884,6 +886,7 @@ static inline abi_long copy_to_user_mq_attr(abi_ulong target_mq_attr_addr,
>  
>      return 0;
>  }
> +#endif
>  
>  /* do_select() must return target values and target errnos. */
>  static abi_long do_select(int n,
> @@ -6851,7 +6854,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
>          break;
>  #endif
>  
> -#ifdef TARGET_NR_mq_open
> +#if defined(TARGET_NR_mq_open) && defined(__NR_mq_open)
>      case TARGET_NR_mq_open:
>          {
>              struct mq_attr posix_mq_attr;
> -- 
> 1.6.2.4
> 
>