diff options
| author | Matthew Booth <mbooth@redhat.com> | 2014-04-29 16:03:29 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-04-30 16:34:14 +0200 |
| commit | b69cdef876340624bb40a2054d14f298471a40a6 (patch) | |
| tree | d1e1d292834d7774ad3ab0e6f59eb6f95a959864 | |
| parent | e466183718bfaaf347a3c02499473068a0072114 (diff) | |
| download | focaccia-qemu-b69cdef876340624bb40a2054d14f298471a40a6.tar.gz focaccia-qemu-b69cdef876340624bb40a2054d14f298471a40a6.zip | |
curl: Remove unnecessary explicit calls to internal event handler
Remove calls to curl_multi_do where the relevant handles are already registered to the event loop. Ensure that we kick off socket handling with CURL_SOCKET_TIMEOUT after adding a new handle. Signed-off-by: Matthew Booth <mbooth@redhat.com> Tested-by: Richard W.M. Jones <rjones@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/curl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/curl.c b/block/curl.c index 50bd05f204..fd2756ec50 100644 --- a/block/curl.c +++ b/block/curl.c @@ -535,7 +535,6 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, curl_multi_setopt(s->multi, CURLMOPT_TIMERDATA, s); curl_multi_setopt(s->multi, CURLMOPT_TIMERFUNCTION, curl_timer_cb); #endif - curl_multi_do(s); qemu_opts_del(opts); return 0; @@ -564,6 +563,7 @@ static const AIOCBInfo curl_aiocb_info = { static void curl_readv_bh_cb(void *p) { CURLState *state; + int running; CURLAIOCB *acb = p; BDRVCURLState *s = acb->common.bs->opaque; @@ -612,8 +612,9 @@ static void curl_readv_bh_cb(void *p) curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range); curl_multi_add_handle(s->multi, state->curl); - curl_multi_do(s); + /* Tell curl it needs to kick things off */ + curl_multi_socket_action(s->multi, CURL_SOCKET_TIMEOUT, 0, &running); } static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs, |