On Tue, 02/23 15:42, Matthew Fortune wrote:
> CONFIG_EPOLL was being used to guard epoll_create1 which results
> in build failures on CentOS 5.
>
> Signed-off-by: Matthew Fortune <matthew.fort...@imgtec.com>
> ---
> 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 <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) {
> --
> 2.2.1
>
Reviewed-by: Fam Zheng <f...@redhat.com>
