Commit 7e003465 authored by Cao jin's avatar Cao jin Committed by Stefan Hajnoczi
Browse files

aio-posix: remove useless parameter 



Parameter **errp of aio_context_setup() is useless, remove it
and clean up the related code.

Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Fam Zheng <famz@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Signed-off-by: default avatarCao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1468578524-23433-1-git-send-email-caoj.fnst@cn.fujitsu.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 5e1b34a3

aio-posix.c

+2 −1
Original line number Diff line number Diff line
@@ -485,12 +485,13 @@ bool aio_poll(AioContext *ctx, bool blocking) 
    return progress;

}



void aio_context_setup(AioContext *ctx, Error **errp)

void aio_context_setup(AioContext *ctx)

{

#ifdef CONFIG_EPOLL_CREATE1

    assert(!ctx->epollfd);

    ctx->epollfd = epoll_create1(EPOLL_CLOEXEC);

    if (ctx->epollfd == -1) {

        fprintf(stderr, "Failed to create epoll instance: %s", strerror(errno));

        ctx->epoll_available = false;

    } else {

        ctx->epoll_available = true;

aio-win32.c

+1 −1
Original line number Diff line number Diff line
@@ -371,6 +371,6 @@ bool aio_poll(AioContext *ctx, bool blocking) 
    return progress;

}



void aio_context_setup(AioContext *ctx, Error **errp)

void aio_context_setup(AioContext *ctx)

{

}

async.c

+2 −6
Original line number Diff line number Diff line
@@ -347,14 +347,10 @@ AioContext *aio_context_new(Error **errp) 
{

    int ret;

    AioContext *ctx;

    Error *local_err = NULL;



    ctx = (AioContext *) g_source_new(&aio_source_funcs, sizeof(AioContext));

    aio_context_setup(ctx, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        goto fail;

    }

    aio_context_setup(ctx);



    ret = event_notifier_init(&ctx->notifier, false);

    if (ret < 0) {

        error_setg_errno(errp, -ret, "Failed to initialize event notifier");

include/block/aio.h

+1 −1
Original line number Diff line number Diff line
@@ -452,6 +452,6 @@ static inline bool aio_node_check(AioContext *ctx, bool is_external) 
 *

 * Initialize the aio context.

 */

void aio_context_setup(AioContext *ctx, Error **errp);

void aio_context_setup(AioContext *ctx);



#endif