[Qemu-devel] [PULL 0/8] Trivial patches for 27 March to 3 April 2012

[Qemu-devel] [PULL 0/8] Trivial patches for 27 March to 3 April 2012

[Stefan Hajnoczi]

I'm will be gone from tomorrow until Monday so it's time to flush the
trivial-patches queue.

The following changes since commit f05f6b4adb4db3affb0cdd17383b0a7e905e66e1:

  qdev: put all devices under /machine (2012-04-02 15:04:15 -0500)

are available in the git repository at:

  git://github.com/stefanha/qemu.git trivial-patches

for you to fetch changes up to 53fbf7b5391c76cc474d469bfed6a69a1243f4de:

  make: fix clean rule by removing build file in qom/ (2012-04-03 09:55:26 +0100)

----------------------------------------------------------------
Anthony PERARD (1):
      make: fix clean rule by removing build file in qom/

Frediano Ziglio (1):
      main-loop: make qemu_event_handle static

Jan Kiszka (1):
      w32: Undefine error constants before their redefinition

Lluís Vilanova (2):
      configure: Link QEMU against 'liburcu-bp'
      configure: Link qga against UST tracing related libraries

Stefan Hajnoczi (1):
      configure: fix mingw32 libs_qga typo

Stefan Weil (2):
      qtest: Add missing GCC_FMT_ATTR
      block/curl: Replace usleep by g_usleep

 Makefile      |    1 +
 block/curl.c  |    2 +-
 configure     |    5 +++--
 main-loop.c   |    2 +-
 qemu_socket.h |    2 ++
 qtest.c       |    3 ++-
 6 files changed, 10 insertions(+), 5 deletions(-)

-- 
1.7.9.1

[Qemu-devel] [PATCH 1/8] configure: fix mingw32 libs_qga typo

[Stefan Hajnoczi]

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 <stefanha@linux.vnet.ibm.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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=""
-- 
1.7.9.1

[Qemu-devel] [PATCH 2/8] w32: Undefine error constants before their redefinition

[Stefan Hajnoczi]

From: Jan Kiszka <jan.kiszka@siemens.com>

Avoids lots of warnings.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 qemu_socket.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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 <ws2tcpip.h>
 
 #define socket_error() WSAGetLastError()
+#undef EWOULDBLOCK
 #undef EINTR
+#undef EINPROGRESS
 #define EWOULDBLOCK WSAEWOULDBLOCK
 #define EINTR       WSAEINTR
 #define EINPROGRESS WSAEINPROGRESS
-- 
1.7.9.1

[Qemu-devel] [PATCH 3/8] qtest: Add missing GCC_FMT_ATTR

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

gcc reports an error when the code is compiled with -Wmissing-format-attribute.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 qtest.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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];
-- 
1.7.9.1

[Qemu-devel] [PATCH 4/8] block/curl: Replace usleep by g_usleep

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

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 <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 block/curl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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);
-- 
1.7.9.1

[Qemu-devel] [PATCH 5/8] main-loop: make qemu_event_handle static

[Stefan Hajnoczi]

From: Frediano Ziglio <freddy77@gmail.com>

Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 main-loop.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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)
 {
-- 
1.7.9.1

[Qemu-devel] [PATCH 6/8] configure: Link QEMU against 'liburcu-bp'

[Stefan Hajnoczi]

From: Lluís Vilanova <vilanova@ac.upc.edu>

This library is needed when using 'ust/tracepoint.h'.

Signed-off-by: Harsh Prateek Bora <harsh@linux.vnet.ibm.com>
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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"
-- 
1.7.9.1

[Qemu-devel] [PATCH 7/8] configure: Link qga against UST tracing related libraries

[Stefan Hajnoczi]

From: Lluís Vilanova <vilanova@ac.upc.edu>

Signed-off-by: Harsh Prateek Bora <harsh@linux.vnet.ibm.com>
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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"
-- 
1.7.9.1

[Qemu-devel] [PATCH 8/8] make: fix clean rule by removing build file in qom/

[Stefan Hajnoczi]

From: Anthony PERARD <anthony.perard@citrix.com>

Make clean does not clean the 'qom' directory, leaving *.o and *.d files. This
patch fixes this.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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
-- 
1.7.9.1