diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-10 08:10:41 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-10 08:10:41 -0500 |
| commit | 72fe3aaed94936739abfa158fa28f147b75ae9ff (patch) | |
| tree | dc7f090fe72b645a5b489ade9088d2125eb8a934 /block | |
| parent | 2c097f6003f2a11416706ae3252c2860ed2257a9 (diff) | |
| parent | 53fbf7b5391c76cc474d469bfed6a69a1243f4de (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
make: fix clean rule by removing build file in qom/
configure: Link qga against UST tracing related libraries
configure: Link QEMU against 'liburcu-bp'
main-loop: make qemu_event_handle static
block/curl: Replace usleep by g_usleep
qtest: Add missing GCC_FMT_ATTR
w32: Undefine error constants before their redefinition
configure: fix mingw32 libs_qga typo
Diffstat (limited to 'block')
| -rw-r--r-- | block/curl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/curl.c b/block/curl.c index e9102e3e20..a909eca337 100644 --- a/block/curl.c +++ b/block/curl.c @@ -282,7 +282,7 @@ static CURLState *curl_init_state(BDRVCURLState *s) break; } if (!state) { - usleep(100); + g_usleep(100); curl_multi_do(s); } } while(!state); |