05bba0
From 3ed5149c2375201051e0e8d38146dffaa0452fcd Mon Sep 17 00:00:00 2001
05bba0
From: Richard Jones <rjones@redhat.com>
05bba0
Date: Thu, 11 Jun 2015 11:40:15 +0200
05bba0
Subject: [PATCH 15/30] curl: Remove unnecessary explicit calls to internal
05bba0
 event handler
05bba0
05bba0
Message-id: <1434022828-13037-9-git-send-email-rjones@redhat.com>
05bba0
Patchwork-id: 65843
05bba0
O-Subject: [RHEL-7.2 qemu-kvm v3 PATCH 08/21] curl: Remove unnecessary explicit calls to internal event handler
05bba0
Bugzilla: 1226684
05bba0
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
05bba0
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
05bba0
05bba0
From: Matthew Booth <mbooth@redhat.com>
05bba0
05bba0
Remove calls to curl_multi_do where the relevant handles are already
05bba0
registered to the event loop.
05bba0
05bba0
Ensure that we kick off socket handling with CURL_SOCKET_TIMEOUT after
05bba0
adding a new handle.
05bba0
05bba0
Signed-off-by: Matthew Booth <mbooth@redhat.com>
05bba0
Tested-by: Richard W.M. Jones <rjones@redhat.com>
05bba0
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
05bba0
05bba0
Upstream-status: b69cdef876340624bb40a2054d14f298471a40a6
05bba0
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
---
05bba0
 block/curl.c | 5 +++--
05bba0
 1 file changed, 3 insertions(+), 2 deletions(-)
05bba0
05bba0
diff --git a/block/curl.c b/block/curl.c
05bba0
index a6631fe..e4332c5 100644
05bba0
--- a/block/curl.c
05bba0
+++ b/block/curl.c
05bba0
@@ -523,7 +523,6 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,
05bba0
     curl_multi_setopt(s->multi, CURLMOPT_TIMERDATA, s);
05bba0
     curl_multi_setopt(s->multi, CURLMOPT_TIMERFUNCTION, curl_timer_cb);
05bba0
 #endif
05bba0
-    curl_multi_do(s);
05bba0
 
05bba0
     qemu_opts_del(opts);
05bba0
     return 0;
05bba0
@@ -567,6 +566,7 @@ static const AIOCBInfo curl_aiocb_info = {
05bba0
 static void curl_readv_bh_cb(void *p)
05bba0
 {
05bba0
     CURLState *state;
05bba0
+    int running;
05bba0
 
05bba0
     CURLAIOCB *acb = p;
05bba0
     BDRVCURLState *s = acb->common.bs->opaque;
05bba0
@@ -615,8 +615,9 @@ static void curl_readv_bh_cb(void *p)
05bba0
     curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range);
05bba0
 
05bba0
     curl_multi_add_handle(s->multi, state->curl);
05bba0
-    curl_multi_do(s);
05bba0
 
05bba0
+    /* Tell curl it needs to kick things off */
05bba0
+    curl_multi_socket_action(s->multi, CURL_SOCKET_TIMEOUT, 0, &running);
05bba0
 }
05bba0
 
05bba0
 static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs,
05bba0
-- 
05bba0
1.8.3.1
05bba0