From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCsMy-0005QS-VM for qemu-devel@nongnu.org; Wed, 28 Mar 2012 08:53:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCsMr-0007qW-0E for qemu-devel@nongnu.org; Wed, 28 Mar 2012 08:52:56 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 28 Mar 2012 14:52:21 +0200 Message-Id: <1332939159-16434-19-git-send-email-afaerber@suse.de> In-Reply-To: <1332939159-16434-1-git-send-email-afaerber@suse.de> References: <1332939159-16434-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH stable-0.15 18/36] block/curl: Implement a flush function on the fd handlers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , kvm@suse.de, qemu-stable@nongnu.org, Bruce Rogers , Nick Thomas , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Nick Thomas Signed-off-by: Nick Thomas Signed-off-by: Kevin Wolf (cherry picked from commit c84dcdc1d6583ebe5841907c99d95deb8c40a6e0) Signed-off-by: Bruce Rogers Signed-off-by: Andreas F=C3=A4rber --- block/curl.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/block/curl.c b/block/curl.c index 407f095..6cf6a70 100644 --- a/block/curl.c +++ b/block/curl.c @@ -76,6 +76,7 @@ typedef struct BDRVCURLState { =20 static void curl_clean_state(CURLState *s); static void curl_multi_do(void *arg); +static int curl_aio_flush(void *opaque); =20 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_fl= ush, + 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_fl= ush, + 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); @@ -394,6 +397,21 @@ out_noclean: return -EINVAL; } =20 +static int curl_aio_flush(void *opaque) +{ + BDRVCURLState *s =3D opaque; + int i, j; + + for (i=3D0; i < CURL_NUM_STATES; i++) { + for(j=3D0; 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... --=20 1.7.7