[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] linux-user: fix mq_* compilation problems
From: |
Riku Voipio |
Subject: |
Re: [Qemu-devel] [PATCH] linux-user: fix mq_* compilation problems |
Date: |
Tue, 21 Jul 2009 23:46:08 +0300 |
User-agent: |
Mutt/1.5.18 (2008-05-17) |
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 <address@hidden>
> ---
> 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
>
>