Commit 0d146022 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

block/curl: drop curl_aio_flush() 



.io_flush() is no longer called so drop curl_aio_flush().  The acb[]
array that the function checks is still used in other parts of
block/curl.c.  Therefore we cannot remove acb[], it is needed.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 164a101f

block/curl.c

+3 −19
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ typedef struct BDRVCURLState { 


static void curl_clean_state(CURLState *s);

static void curl_multi_do(void *arg);

static int curl_aio_flush(void *opaque);



static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,

                        void *s, void *sp)
@@ -94,14 +93,14 @@ 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, s);

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

            break;

        case CURL_POLL_OUT:

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

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

            break;

        case CURL_POLL_INOUT:

            qemu_aio_set_fd_handler(fd, curl_multi_do, curl_multi_do,

                                    curl_aio_flush, s);

                                    NULL, s);

            break;

        case CURL_POLL_REMOVE:

            qemu_aio_set_fd_handler(fd, NULL, NULL, NULL, NULL);
@@ -495,21 +494,6 @@ out_noclean: 
    return -EINVAL;

}



static int curl_aio_flush(void *opaque)

{

    BDRVCURLState *s = opaque;

    int i, j;



    for (i=0; i < CURL_NUM_STATES; i++) {

        for(j=0; j < CURL_NUM_ACB; j++) {

            if (s->states[i].acb[j]) {

                return 1;

            }

        }

    }

    return 0;

}



static void curl_aio_cancel(BlockDriverAIOCB *blockacb)

{

    // Do we have to implement canceling? Seems to work without...