From patchwork Tue Feb 23 15:42:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Fortune X-Patchwork-Id: 586919 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 83256140D2D for ; Wed, 24 Feb 2016 02:42:45 +1100 (AEDT) Received: from localhost ([::1]:57960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYF6p-0007ng-Ko for incoming@patchwork.ozlabs.org; Tue, 23 Feb 2016 10:42:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYF6T-0007Ob-Uu for qemu-devel@nongnu.org; Tue, 23 Feb 2016 10:42:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYF6O-0005FT-QV for qemu-devel@nongnu.org; Tue, 23 Feb 2016 10:42:21 -0500 Received: from mailapp01.imgtec.com ([195.59.15.196]:43219) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYF6O-0005FK-M0 for qemu-devel@nongnu.org; Tue, 23 Feb 2016 10:42:16 -0500 Received: from HHMAIL01.hh.imgtec.org (unknown [10.100.10.19]) by Websense Email Security Gateway with ESMTPS id 1615062263A32; Tue, 23 Feb 2016 15:42:13 +0000 (GMT) Received: from hhmail02.hh.imgtec.org ([fe80::5400:d33e:81a4:f775]) by HHMAIL01.hh.imgtec.org ([fe80::710b:f219:72bc:e0b3%26]) with mapi id 14.03.0266.001; Tue, 23 Feb 2016 15:42:15 +0000 From: Matthew Fortune To: "qemu-devel@nongnu.org" Thread-Topic: [PATCH] aio-posix: Change CONFIG_EPOLL to CONFIG_EPOLL_CREATE1 Thread-Index: AdFuUHXm1d2FfShxRTC0rIs8YrN+vQ== Date: Tue, 23 Feb 2016 15:42:14 +0000 Message-ID: <6D39441BF12EF246A7ABCE6654B023536BB85D08@hhmail02.hh.imgtec.org> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.168.152.105] MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.59.15.196 Cc: Fam Zheng , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] aio-posix: Change CONFIG_EPOLL to CONFIG_EPOLL_CREATE1 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 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 --- 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) {