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 | |
| parent | 2c097f6003f2a11416706ae3252c2860ed2257a9 (diff) | |
| parent | 53fbf7b5391c76cc474d469bfed6a69a1243f4de (diff) | |
| download | focaccia-qemu-72fe3aaed94936739abfa158fa28f147b75ae9ff.tar.gz focaccia-qemu-72fe3aaed94936739abfa158fa28f147b75ae9ff.zip | |
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
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | block/curl.c | 2 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | main-loop.c | 2 | ||||
| -rw-r--r-- | qemu_socket.h | 2 | ||||
| -rw-r--r-- | qtest.c | 3 |
6 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile index 35c7a2a551..a78f53d4c9 100644 --- a/Makefile +++ b/Makefile @@ -217,6 +217,7 @@ clean: rm -f *.o *.d *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~ rm -Rf .libs rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o qga/*.d + rm -f qom/*.o qom/*.d rm -f qemu-img-cmds.h rm -f trace/*.o trace/*.d rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp 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); diff --git a/configure b/configure index 671b232506..e05f34b9c0 100755 --- a/configure +++ b/configure @@ -526,7 +526,7 @@ EOF bindir="\${prefix}" sysconfdir="\${prefix}" confsuffix="" - libs_qga="-lws2_32 -lwinmm -lpowrprof $lib_qga" + libs_qga="-lws2_32 -lwinmm -lpowrprof $libs_qga" fi werror="" @@ -2680,7 +2680,8 @@ if test "$trace_backend" = "ust"; then int main(void) { return 0; } EOF if compile_prog "" "" ; then - LIBS="-lust $LIBS" + LIBS="-lust -lurcu-bp $LIBS" + libs_qga="-lust -lurcu-bp $libs_qga" else echo echo "Error: Trace backend 'ust' missing libust header files" diff --git a/main-loop.c b/main-loop.c index 7e163f9428..1ebdc4baf1 100644 --- a/main-loop.c +++ b/main-loop.c @@ -164,7 +164,7 @@ static int qemu_signal_init(void) #else /* _WIN32 */ -HANDLE qemu_event_handle = NULL; +static HANDLE qemu_event_handle = NULL; static void dummy_event_handler(void *opaque) { diff --git a/qemu_socket.h b/qemu_socket.h index fe4cf6ca61..51ad210a7f 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -8,7 +8,9 @@ #include <ws2tcpip.h> #define socket_error() WSAGetLastError() +#undef EWOULDBLOCK #undef EINTR +#undef EINPROGRESS #define EWOULDBLOCK WSAEWOULDBLOCK #define EINTR WSAEINTR #define EINPROGRESS WSAEINPROGRESS diff --git a/qtest.c b/qtest.c index daeabb7c25..18afcd9cf1 100644 --- a/qtest.c +++ b/qtest.c @@ -156,7 +156,8 @@ static void qtest_send_prefix(CharDriverState *chr) tv.tv_sec, tv.tv_usec); } -static void qtest_send(CharDriverState *chr, const char *fmt, ...) +static void GCC_FMT_ATTR(2, 3) qtest_send(CharDriverState *chr, + const char *fmt, ...) { va_list ap; char buffer[1024]; |