From patchwork Tue Feb 23 01:20:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 586623 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 02DD8140C41 for ; Tue, 23 Feb 2016 12:20:53 +1100 (AEDT) Received: from localhost ([::1]:53031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aY1el-00031r-2d for incoming@patchwork.ozlabs.org; Mon, 22 Feb 2016 20:20:51 -0500 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 Received: from mx1.redhat.com ([209.132.183.28]:59143) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aY1eF-0005w6-Pp; Mon, 22 Feb 2016 20:20:19 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 6D0A48E3CA; Tue, 23 Feb 2016 01:20:19 +0000 (UTC) Received: from fam-t430.nay.redhat.com (dhcp-15-42.nay.redhat.com [10.66.15.42]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1N1KF6l012524; Mon, 22 Feb 2016 20:20:17 -0500 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 23 Feb 2016 09:20:14 +0800 Message-Id: <1456190414-14451-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-block@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] aio-posix: Don't use epoll if epoll_create1 not available X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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) {