From patchwork Thu Mar 17 11:08:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 8610091 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CB3E6C0553 for ; Thu, 17 Mar 2016 11:09:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3DF3B202F0 for ; Thu, 17 Mar 2016 11:09:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5285C202E6 for ; Thu, 17 Mar 2016 11:09:00 +0000 (UTC) Received: from localhost ([::1]:34098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agVnX-0001bn-HW for patchwork-qemu-devel@patchwork.kernel.org; Thu, 17 Mar 2016 07:08:59 -0400 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 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 8362E7AEB6; Thu, 17 Mar 2016 11:08:39 +0000 (UTC) Received: from localhost (ovpn-112-49.ams2.redhat.com [10.36.112.49]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2HB8coE011076; Thu, 17 Mar 2016 07:08:39 -0400 From: Stefan Hajnoczi To: 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Matthew Fortune , Stefan Hajnoczi Subject: [Qemu-devel] [PULL 1/2] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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) {