diff options
| author | Peter Maydell | 2016-03-17 12:27:54 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-03-17 12:27:54 +0100 |
| commit | 331ac65963ab74dd84659b748affa0b111486f06 (patch) | |
| tree | f6cfc2b655d997660b63add838cc64f24124cc65 /aio-posix.c | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' int... (diff) | |
| parent | Revert "qed: Implement .bdrv_drain" (diff) | |
| download | qemu-331ac65963ab74dd84659b748affa0b111486f06.tar.gz qemu-331ac65963ab74dd84659b748affa0b111486f06.tar.xz qemu-331ac65963ab74dd84659b748affa0b111486f06.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Thu 17 Mar 2016 11:08:28 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
Revert "qed: Implement .bdrv_drain"
aio-posix: Change CONFIG_EPOLL to CONFIG_EPOLL_CREATE1
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'aio-posix.c')
| -rw-r--r-- | aio-posix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/aio-posix.c b/aio-posix.c index fa7f8ab2a5..7fd565fbde 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 <sys/epoll.h> #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) { |