From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aY1eL-0002Yo-3T for qemu-devel@nongnu.org; Mon, 22 Feb 2016 20:20:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aY1eK-0005x9-8G for qemu-devel@nongnu.org; Mon, 22 Feb 2016 20:20:25 -0500 From: Fam Zheng Date: Tue, 23 Feb 2016 09:20:14 +0800 Message-Id: <1456190414-14451-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH] aio-posix: Don't use epoll if epoll_create1 not available List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Stefan Hajnoczi Reported-by: Matthew Fortune Signed-off-by: Fam Zheng --- aio-posix.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/aio-posix.c b/aio-posix.c index fa7f8ab..97e5a0c 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -18,7 +18,9 @@ #include "block/block.h" #include "qemu/queue.h" #include "qemu/sockets.h" -#ifdef CONFIG_EPOLL + +#if defined(CONFIG_EPOLL) && defined(CONFIG_EPOLL_CREATE1) +#define USE_EPOLL 1 #include #endif @@ -33,7 +35,7 @@ struct AioHandler QLIST_ENTRY(AioHandler) node; }; -#ifdef CONFIG_EPOLL +#ifdef USE_EPOLL /* The fd number threashold to switch to epoll */ #define EPOLL_ENABLE_THRESHOLD 64 @@ -483,7 +485,7 @@ bool aio_poll(AioContext *ctx, bool blocking) void aio_context_setup(AioContext *ctx, Error **errp) { -#ifdef CONFIG_EPOLL +#ifdef USE_EPOLL assert(!ctx->epollfd); ctx->epollfd = epoll_create1(EPOLL_CLOEXEC); if (ctx->epollfd == -1) { -- 2.4.3