From 368542b8356038593c4d394d87ee086ef65a6da3 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Tue, 27 Mar 2012 08:26:18 +0100 Subject: configure: fix mingw32 libs_qga typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's typical to prepend or append parameters to an argument string so that other places in ./configure can add parameters without clobbering the string. In the mingw32 libs_qga case there is a typo "$lib_qga" instead of "$libs_qga". Signed-off-by: Stefan Hajnoczi Reviewed-by: Andreas Färber --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 4b3adc9..c0a542b 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="" -- cgit v1.1 From 6cec29c4a0338bfd96dec42cce51c9c447facb23 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 28 Mar 2012 20:56:38 +0200 Subject: w32: Undefine error constants before their redefinition Avoids lots of warnings. Signed-off-by: Jan Kiszka Signed-off-by: Stefan Hajnoczi --- qemu_socket.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qemu_socket.h b/qemu_socket.h index fe4cf6c..51ad210 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -8,7 +8,9 @@ #include #define socket_error() WSAGetLastError() +#undef EWOULDBLOCK #undef EINTR +#undef EINPROGRESS #define EWOULDBLOCK WSAEWOULDBLOCK #define EINTR WSAEINTR #define EINPROGRESS WSAEINPROGRESS -- cgit v1.1 From 3f97fd851cf7b16b822c2c366e02708070f713bb Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 31 Mar 2012 17:11:31 +0200 Subject: qtest: Add missing GCC_FMT_ATTR gcc reports an error when the code is compiled with -Wmissing-format-attribute. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- qtest.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qtest.c b/qtest.c index daeabb7..18afcd9 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]; -- cgit v1.1 From fb7c8e8a2d3ac99c9310a01d17a2b46584320bc9 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 31 Mar 2012 17:34:41 +0200 Subject: block/curl: Replace usleep by g_usleep The function usleep is not available for all supported platforms: at least some versions of MinGW don't support it. usleep was also declared obsolete by POSIX.1-2001. The function g_usleep is part of glib2.0, so it is available for all supported platforms. Using nanosleep would also be possible but needs more code. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- block/curl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/curl.c b/block/curl.c index e9102e3..a909eca 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); -- cgit v1.1 From a92433afcc1e48b0ba7a014bb6d2f0a7cd416a31 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Sat, 31 Mar 2012 19:32:14 +0100 Subject: main-loop: make qemu_event_handle static Signed-off-by: Frediano Ziglio Signed-off-by: Stefan Hajnoczi --- main-loop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main-loop.c b/main-loop.c index db23de0..fc738d1 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) { -- cgit v1.1 From 94b4fefae6aa8ee7739b2b9ad6ef14a07baf78be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= Date: Mon, 2 Apr 2012 14:49:44 +0200 Subject: configure: Link QEMU against 'liburcu-bp' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This library is needed when using 'ust/tracepoint.h'. Signed-off-by: Harsh Prateek Bora Signed-off-by: Lluís Vilanova Signed-off-by: Stefan Hajnoczi --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index c0a542b..319355b 100755 --- a/configure +++ b/configure @@ -2672,7 +2672,7 @@ if test "$trace_backend" = "ust"; then int main(void) { return 0; } EOF if compile_prog "" "" ; then - LIBS="-lust $LIBS" + LIBS="-lust -lurcu-bp $LIBS" else echo echo "Error: Trace backend 'ust' missing libust header files" -- cgit v1.1 From c9a2e37c7d70e1b1f11997f7ecab202393bff9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= Date: Mon, 2 Apr 2012 14:49:49 +0200 Subject: configure: Link qga against UST tracing related libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Harsh Prateek Bora Signed-off-by: Lluís Vilanova Signed-off-by: Stefan Hajnoczi --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 319355b..520bd93 100755 --- a/configure +++ b/configure @@ -2673,6 +2673,7 @@ int main(void) { return 0; } EOF if compile_prog "" "" ; then LIBS="-lust -lurcu-bp $LIBS" + libs_qga="-lust -lurcu-bp $libs_qga" else echo echo "Error: Trace backend 'ust' missing libust header files" -- cgit v1.1 From 53fbf7b5391c76cc474d469bfed6a69a1243f4de Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Mon, 2 Apr 2012 16:10:39 +0100 Subject: make: fix clean rule by removing build file in qom/ Make clean does not clean the 'qom' directory, leaving *.o and *.d files. This patch fixes this. Signed-off-by: Anthony PERARD Signed-off-by: Stefan Hajnoczi --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 35c7a2a..a78f53d 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 -- cgit v1.1