From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43606)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1aYNMO-0003oW-MU
	for qemu-devel@nongnu.org; Tue, 23 Feb 2016 19:31:21 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1aYNMJ-0007un-N3
	for qemu-devel@nongnu.org; Tue, 23 Feb 2016 19:31:20 -0500
Received: from mx1.redhat.com ([209.132.183.28]:48269)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1aYNMJ-0007ub-HU
	for qemu-devel@nongnu.org; Tue, 23 Feb 2016 19:31:15 -0500
Date: Wed, 24 Feb 2016 08:31:13 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20160224003113.GB749@ad.usersys.redhat.com>
References: <6D39441BF12EF246A7ABCE6654B023536BB85D08@hhmail02.hh.imgtec.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <6D39441BF12EF246A7ABCE6654B023536BB85D08@hhmail02.hh.imgtec.org>
Subject: Re: [Qemu-devel] [PATCH] aio-posix: Change CONFIG_EPOLL to
 CONFIG_EPOLL_CREATE1
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Matthew Fortune <Matthew.Fortune@imgtec.com>
Cc: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>, Stefan Hajnoczi <stefanha@redhat.com>

On Tue, 02/23 15:42, Matthew Fortune wrote:
> CONFIG_EPOLL was being used to guard epoll_create1 which results
> in build failures on CentOS 5.
> 
> Signed-off-by: Matthew Fortune <matthew.fortune@imgtec.com>
> ---
>  aio-posix.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/aio-posix.c b/aio-posix.c
> index fa7f8ab..7fd565f 100644
> --- a/aio-posix.c
> +++ b/aio-posix.c
> @@ -18,7 +18,7 @@
>  #include "block/block.h"
>  #include "qemu/queue.h"
>  #include "qemu/sockets.h"
> -#ifdef CONFIG_EPOLL
> +#ifdef CONFIG_EPOLL_CREATE1
>  #include <sys/epoll.h>
>  #endif
>  
> @@ -33,7 +33,7 @@ struct AioHandler
>      QLIST_ENTRY(AioHandler) node;
>  };
>  
> -#ifdef CONFIG_EPOLL
> +#ifdef CONFIG_EPOLL_CREATE1
>  
>  /* The fd number threashold to switch to epoll */
>  #define EPOLL_ENABLE_THRESHOLD 64
> @@ -483,7 +483,7 @@ bool aio_poll(AioContext *ctx, bool blocking)
>  
>  void aio_context_setup(AioContext *ctx, Error **errp)
>  {
> -#ifdef CONFIG_EPOLL
> +#ifdef CONFIG_EPOLL_CREATE1
>      assert(!ctx->epollfd);
>      ctx->epollfd = epoll_create1(EPOLL_CLOEXEC);
>      if (ctx->epollfd == -1) {
> -- 
> 2.2.1
> 

Reviewed-by: Fam Zheng <famz@redhat.com>