curl: Remove erroneous sleep waiting for curl completion
authorMatthew Booth <mbooth@redhat.com>
Tue, 29 Apr 2014 15:03:28 +0000 (16:03 +0100)
committerKevin Wolf <kwolf@redhat.com>
Wed, 30 Apr 2014 14:34:11 +0000 (16:34 +0200)
The driver will not start more than a fixed number of curl sessions.
If it needs more, it must wait for the completion of an existing one.
The driver was sleeping, which will prevent the main loop from
running, and therefore the event it's waiting on. It was also directly
calling its internal handler rather than waiting on existing
registered handlers to be called from the main loop.

This change causes it simply to wait for a period of time whilst
allowing the main loop to execute.

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>
block/curl.c

index 26c9cac50509b8f0d46d640acd3d7229d7cc481d..50bd05f204e6ca7cbc00e0b48a9f86034b695de8 100644 (file)
@@ -337,8 +337,7 @@ static CURLState *curl_init_state(BDRVCURLState *s)
             break;
         }
         if (!state) {
-            g_usleep(100);
-            curl_multi_do(s);
+            qemu_aio_wait();
         }
     } while(!state);