Commit bafbd6a1 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

aio: remove process_queue callback and qemu_aio_process_queue 



Both unused after the previous patch.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent adfe92f6

aio.c

+2 −27
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct AioHandler 
    IOHandler *io_read;

    IOHandler *io_write;

    AioFlushHandler *io_flush;

    AioProcessQueue *io_process_queue;

    int deleted;

    void *opaque;

    QLIST_ENTRY(AioHandler) node;
@@ -58,7 +57,6 @@ int qemu_aio_set_fd_handler(int fd, 
                            IOHandler *io_read,

                            IOHandler *io_write,

                            AioFlushHandler *io_flush,

                            AioProcessQueue *io_process_queue,

                            void *opaque)

{

    AioHandler *node;
@@ -91,7 +89,6 @@ int qemu_aio_set_fd_handler(int fd, 
        node->io_read = io_read;

        node->io_write = io_write;

        node->io_flush = io_flush;

        node->io_process_queue = io_process_queue;

        node->opaque = opaque;

    }
@@ -122,39 +119,17 @@ void qemu_aio_flush(void) 
    } while (qemu_bh_poll() || ret > 0);

}



int qemu_aio_process_queue(void)

{

    AioHandler *node;

    int ret = 0;



    walking_handlers = 1;



    QLIST_FOREACH(node, &aio_handlers, node) {

        if (node->io_process_queue) {

            if (node->io_process_queue(node->opaque)) {

                ret = 1;

            }

        }

    }



    walking_handlers = 0;



    return ret;

}



void qemu_aio_wait(void)

{

    int ret;



    if (qemu_bh_poll())

        return;



    /*

     * If there are callbacks left that have been queued, we need to call then.

     * Return afterwards to avoid waiting needlessly in select().

     */

    if (qemu_aio_process_queue())

    if (qemu_bh_poll()) {

        return;

    }



    do {

        AioHandler *node;

block/curl.c

+4 −6
Original line number Diff line number Diff line
@@ -89,19 +89,17 @@ 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, curl_aio_flush,

                                    NULL, s);

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

            break;

        case CURL_POLL_OUT:

            qemu_aio_set_fd_handler(fd, NULL, curl_multi_do, curl_aio_flush,

                                    NULL, s);

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

            break;

        case CURL_POLL_INOUT:

            qemu_aio_set_fd_handler(fd, curl_multi_do, curl_multi_do,

                                    curl_aio_flush, NULL, s);

                                    curl_aio_flush, s);

            break;

        case CURL_POLL_REMOVE:

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

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

            break;

    }

block/iscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ iscsi_set_events(IscsiLun *iscsilun) 
    qemu_aio_set_fd_handler(iscsi_get_fd(iscsi), iscsi_process_read,

                           (iscsi_which_events(iscsi) & POLLOUT)

                           ? iscsi_process_write : NULL,

                           iscsi_process_flush, NULL, iscsilun);

                           iscsi_process_flush, iscsilun);

}



static void
@@ -682,7 +682,7 @@ static void iscsi_close(BlockDriverState *bs) 
    IscsiLun *iscsilun = bs->opaque;

    struct iscsi_context *iscsi = iscsilun->iscsi;



    qemu_aio_set_fd_handler(iscsi_get_fd(iscsi), NULL, NULL, NULL, NULL, NULL);

    qemu_aio_set_fd_handler(iscsi_get_fd(iscsi), NULL, NULL, NULL, NULL);

    iscsi_destroy_context(iscsi);

    memset(iscsilun, 0, sizeof(IscsiLun));

}

block/nbd.c

+4 −4
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int nbd_co_send_request(BDRVNBDState *s, struct nbd_request *request, 
    qemu_co_mutex_lock(&s->send_mutex);

    s->send_coroutine = qemu_coroutine_self();

    qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, nbd_restart_write,

                            nbd_have_request, NULL, s);

                            nbd_have_request, s);

    rc = nbd_send_request(s->sock, request);

    if (rc != -1 && iov) {

        ret = qemu_co_sendv(s->sock, iov, request->len, offset);
@@ -201,7 +201,7 @@ static int nbd_co_send_request(BDRVNBDState *s, struct nbd_request *request, 
        }

    }

    qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, NULL,

                            nbd_have_request, NULL, s);

                            nbd_have_request, s);

    s->send_coroutine = NULL;

    qemu_co_mutex_unlock(&s->send_mutex);

    return rc;
@@ -274,7 +274,7 @@ static int nbd_establish_connection(BlockDriverState *bs) 
     * kick the reply mechanism.  */

    socket_set_nonblock(sock);

    qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, NULL,

                            nbd_have_request, NULL, s);

                            nbd_have_request, s);



    s->sock = sock;

    s->size = size;
@@ -294,7 +294,7 @@ static void nbd_teardown_connection(BlockDriverState *bs) 
    request.len = 0;

    nbd_send_request(s->sock, &request);



    qemu_aio_set_fd_handler(s->sock, NULL, NULL, NULL, NULL, NULL);

    qemu_aio_set_fd_handler(s->sock, NULL, NULL, NULL, NULL);

    closesocket(s->sock);

}

block/rbd.c

+2 −3
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static int qemu_rbd_open(BlockDriverState *bs, const char *filename, int flags) 
    fcntl(s->fds[0], F_SETFL, O_NONBLOCK);

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

    qemu_aio_set_fd_handler(s->fds[RBD_FD_READ], qemu_rbd_aio_event_reader,

                            NULL, qemu_rbd_aio_flush_cb, NULL, s);

                            NULL, qemu_rbd_aio_flush_cb, s);





    return 0;
@@ -525,8 +525,7 @@ static void qemu_rbd_close(BlockDriverState *bs) 


    close(s->fds[0]);

    close(s->fds[1]);

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

        NULL);

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



    rbd_close(s->image);

    rados_ioctx_destroy(s->io_ctx);