Commit 147dfab7 authored by Matthew Fortune's avatar Matthew Fortune Committed by Stefan Hajnoczi
Browse files

aio-posix: Change CONFIG_EPOLL to CONFIG_EPOLL_CREATE1 



CONFIG_EPOLL was being used to guard epoll_create1 which results
in build failures on CentOS 5.

Signed-off-by: default avatarMatthew Fortune <matthew.fortune@imgtec.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Message-id: 6D39441BF12EF246A7ABCE6654B023536BB85D08@hhmail02.hh.imgtec.org
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 8c457547

aio-posix.c

+3 −3
Original line number Diff line number Diff line
@@ -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) {