diff options
| author | Nick Thomas <nick@bytemark.co.uk> | 2011-09-21 11:55:49 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-09-21 15:16:02 +0200 |
| commit | c84dcdc1d6583ebe5841907c99d95deb8c40a6e0 (patch) | |
| tree | 29e476404fa8722fbdc45d95eb09cf80966ee029 | |
| parent | 465f1ab16169f5d71e52f11d4c650a50fd681030 (diff) | |
| download | qemu-c84dcdc1d6583ebe5841907c99d95deb8c40a6e0.tar.gz qemu-c84dcdc1d6583ebe5841907c99d95deb8c40a6e0.tar.bz2 qemu-c84dcdc1d6583ebe5841907c99d95deb8c40a6e0.zip | |
block/curl: Implement a flush function on the fd handlers
Signed-off-by: Nick Thomas <nick@bytemark.co.uk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/curl.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/block/curl.c b/block/curl.c index f3f61cc8a1..21fed93ac5 100644 --- a/block/curl.c +++ b/block/curl.c @@ -76,6 +76,7 @@ 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) @@ -83,14 +84,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, NULL, s); + qemu_aio_set_fd_handler(fd, curl_multi_do, NULL, curl_aio_flush, + NULL, s); break; case CURL_POLL_OUT: - qemu_aio_set_fd_handler(fd, NULL, curl_multi_do, NULL, NULL, s); + qemu_aio_set_fd_handler(fd, NULL, curl_multi_do, curl_aio_flush, + NULL, s); break; case CURL_POLL_INOUT: - qemu_aio_set_fd_handler(fd, curl_multi_do, - curl_multi_do, NULL, NULL, s); + qemu_aio_set_fd_handler(fd, curl_multi_do, curl_multi_do, + curl_aio_flush, NULL, s); break; case CURL_POLL_REMOVE: qemu_aio_set_fd_handler(fd, NULL, NULL, NULL, NULL, NULL); @@ -412,6 +415,21 @@ 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... |