From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agVnH-0001XM-V6 for qemu-devel@nongnu.org; Thu, 17 Mar 2016 07:08:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agVnD-0005l2-V0 for qemu-devel@nongnu.org; Thu, 17 Mar 2016 07:08:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agVnD-0005kv-Pe for qemu-devel@nongnu.org; Thu, 17 Mar 2016 07:08:39 -0400 From: Stefan Hajnoczi Date: Thu, 17 Mar 2016 11:08:34 +0000 Message-Id: <1458212915-32614-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1458212915-32614-1-git-send-email-stefanha@redhat.com> References: <1458212915-32614-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 1/2] aio-posix: Change CONFIG_EPOLL to CONFIG_EPOLL_CREATE1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Matthew Fortune , Stefan Hajnoczi From: Matthew Fortune CONFIG_EPOLL was being used to guard epoll_create1 which results in build failures on CentOS 5. Signed-off-by: Matthew Fortune Reviewed-by: Fam Zheng Message-id: 6D39441BF12EF246A7ABCE6654B023536BB85D08@hhmail02.hh.imgtec.org Signed-off-by: Stefan Hajnoczi --- 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 #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.5.0