Commit f2e5dca4 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

aio: drop io_flush argument 



The .io_flush() handler no longer exists and has no users.  Drop the
io_flush argument to aio_set_fd_handler() and related functions.

The AioFlushEventNotifierHandler and AioFlushHandler typedefs are no
longer used and are dropped too.

Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 1b9ecdb1

aio-posix.c

+2 −5
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ void aio_set_fd_handler(AioContext *ctx, 
                        int fd,

                        IOHandler *io_read,

                        IOHandler *io_write,

                        AioFlushHandler *io_flush,

                        void *opaque)

{

    AioHandler *node;
@@ -95,12 +94,10 @@ void aio_set_fd_handler(AioContext *ctx, 


void aio_set_event_notifier(AioContext *ctx,

                            EventNotifier *notifier,

                            EventNotifierHandler *io_read,

                            AioFlushEventNotifierHandler *io_flush)

                            EventNotifierHandler *io_read)

{

    aio_set_fd_handler(ctx, event_notifier_get_fd(notifier),

                       (IOHandler *)io_read, NULL,

                       (AioFlushHandler *)io_flush, notifier);

                       (IOHandler *)io_read, NULL, notifier);

}



bool aio_pending(AioContext *ctx)

aio-win32.c

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ struct AioHandler { 


void aio_set_event_notifier(AioContext *ctx,

                            EventNotifier *e,

                            EventNotifierHandler *io_notify,

                            AioFlushEventNotifierHandler *io_flush)

                            EventNotifierHandler *io_notify)

{

    AioHandler *node;

async.c

+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ aio_ctx_finalize(GSource *source) 
    AioContext *ctx = (AioContext *) source;



    thread_pool_free(ctx->thread_pool);

    aio_set_event_notifier(ctx, &ctx->notifier, NULL, NULL);

    aio_set_event_notifier(ctx, &ctx->notifier, NULL);

    event_notifier_cleanup(&ctx->notifier);

    qemu_mutex_destroy(&ctx->bh_lock);

    g_array_free(ctx->pollfds, TRUE);
@@ -243,7 +243,7 @@ AioContext *aio_context_new(void) 
    event_notifier_init(&ctx->notifier, false);

    aio_set_event_notifier(ctx, &ctx->notifier, 

                           (EventNotifierHandler *)

                           event_notifier_test_and_clear, NULL);

                           event_notifier_test_and_clear);



    return ctx;

}

block/curl.c

+4 −5
Original line number Diff line number Diff line
@@ -93,17 +93,16 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action, 
    DPRINTF("CURL (AIO): Sock action %d on fd %d\n", action, fd);

    switch (action) {

        case CURL_POLL_IN:

            qemu_aio_set_fd_handler(fd, curl_multi_do, NULL, NULL, s);

            qemu_aio_set_fd_handler(fd, curl_multi_do, NULL, s);

            break;

        case CURL_POLL_OUT:

            qemu_aio_set_fd_handler(fd, NULL, curl_multi_do, NULL, s);

            qemu_aio_set_fd_handler(fd, NULL, curl_multi_do, s);

            break;

        case CURL_POLL_INOUT:

            qemu_aio_set_fd_handler(fd, curl_multi_do, curl_multi_do,

                                    NULL, s);

            qemu_aio_set_fd_handler(fd, curl_multi_do, curl_multi_do, s);

            break;

        case CURL_POLL_REMOVE:

            qemu_aio_set_fd_handler(fd, NULL, NULL, NULL, NULL);

            qemu_aio_set_fd_handler(fd, NULL, NULL, NULL);

            break;

    }

block/gluster.c

+3 −4
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options, 
    }

    fcntl(s->fds[GLUSTER_FD_READ], F_SETFL, O_NONBLOCK);

    qemu_aio_set_fd_handler(s->fds[GLUSTER_FD_READ],

        qemu_gluster_aio_event_reader, NULL, NULL, s);

        qemu_gluster_aio_event_reader, NULL, s);



out:

    qemu_opts_del(opts);
@@ -438,8 +438,7 @@ static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, void *arg) 
        qemu_aio_release(acb);

        close(s->fds[GLUSTER_FD_READ]);

        close(s->fds[GLUSTER_FD_WRITE]);

        qemu_aio_set_fd_handler(s->fds[GLUSTER_FD_READ], NULL, NULL, NULL,

            NULL);

        qemu_aio_set_fd_handler(s->fds[GLUSTER_FD_READ], NULL, NULL, NULL);

        bs->drv = NULL; /* Make the disk inaccessible */

        qemu_mutex_unlock_iothread();

    }
@@ -595,7 +594,7 @@ static void qemu_gluster_close(BlockDriverState *bs) 


    close(s->fds[GLUSTER_FD_READ]);

    close(s->fds[GLUSTER_FD_WRITE]);

    qemu_aio_set_fd_handler(s->fds[GLUSTER_FD_READ], NULL, NULL, NULL, NULL);

    qemu_aio_set_fd_handler(s->fds[GLUSTER_FD_READ], NULL, NULL, NULL);



    if (s->fd) {

        glfs_close(s->fd);