From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH] aio-posix: Don't use epoll if epoll_create1 not available
Date: Tue, 23 Feb 2016 09:20:14 +0800 [thread overview]
Message-ID: <1456190414-14451-1-git-send-email-famz@redhat.com> (raw)
Reported-by: Matthew Fortune <Matthew.Fortune@imgtec.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
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 <sys/epoll.h>
#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
next reply other threads:[~2016-02-23 1:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 1:20 Fam Zheng [this message]
2016-02-23 11:28 ` [Qemu-devel] [PATCH] aio-posix: Don't use epoll if epoll_create1 not available Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456190414-14451-1-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).