[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/18] block/curl: drop curl_aio_flush()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 07/18] block/curl: drop curl_aio_flush() |
Date: |
Mon, 19 Aug 2013 16:17:46 +0200 |
.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: Stefan Hajnoczi <address@hidden>
---
block/curl.c | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/block/curl.c b/block/curl.c
index 82d39ff..5999924 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -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...
--
1.8.3.1
- [Qemu-devel] [PULL v2 00/18] Block patches, Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 03/18] dataplane/virtio-blk: check exit conditions before aio_poll(), Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 02/18] block: stop relying on io_flush() in bdrv_drain_all(), Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 05/18] tests: adjust test-thread-pool to new aio_poll() semantics, Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 01/18] block: ensure bdrv_drain_all() works during bdrv_delete(), Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 04/18] tests: adjust test-aio to new aio_poll() semantics, Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 07/18] block/curl: drop curl_aio_flush(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 06/18] aio: stop using .io_flush(), Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 09/18] block/iscsi: drop iscsi_process_flush(), Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 08/18] block/gluster: drop qemu_gluster_aio_flush_cb(), Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 10/18] block/linux-aio: drop qemu_laio_completion_cb(), Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 11/18] block/nbd: drop nbd_have_request(), Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 12/18] block/rbd: drop qemu_rbd_aio_flush_cb(), Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 17/18] tests: drop event_active_cb(), Stefan Hajnoczi, 2013/08/19
- [Qemu-devel] [PULL 18/18] aio: drop io_flush argument, Stefan Hajnoczi, 2013/08/19