SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Browse Source 
* 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
This commit is contained in:
Anthony Liguori 2012-04-10 08:10:41 -05:00
commit 72fe3aaed9
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -217,6 +217,7 @@ clean:
rm -f *.o *.d *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~ rm -f *.o *.d *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~
rm -Rf .libs 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 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 qemu-img-cmds.h
rm -f trace/*.o trace/*.d rm -f trace/*.o trace/*.d
rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp

2
block/curl.c
View File

@ -282,7 +282,7 @@ static CURLState *curl_init_state(BDRVCURLState *s)
break; break;
} }
if (!state) { if (!state) {
usleep(100); g_usleep(100);
curl_multi_do(s); curl_multi_do(s);
} }
} while(!state); } while(!state);

5
configure vendored
View File

@ -526,7 +526,7 @@ EOF
bindir="\${prefix}" bindir="\${prefix}"
sysconfdir="\${prefix}" sysconfdir="\${prefix}"
confsuffix="" confsuffix=""
libs_qga="-lws2_32 -lwinmm -lpowrprof $lib_qga" libs_qga="-lws2_32 -lwinmm -lpowrprof $libs_qga"
fi fi
werror="" werror=""
@ -2680,7 +2680,8 @@ if test "$trace_backend" = "ust"; then
int main(void) { return 0; } int main(void) { return 0; }
EOF EOF
if compile_prog "" "" ; then if compile_prog "" "" ; then
LIBS="-lust $LIBS" LIBS="-lust -lurcu-bp $LIBS"
libs_qga="-lust -lurcu-bp $libs_qga"
else else
echo echo
echo "Error: Trace backend 'ust' missing libust header files" echo "Error: Trace backend 'ust' missing libust header files"

2
main-loop.c
View File

@ -164,7 +164,7 @@ static int qemu_signal_init(void)
#else /* _WIN32 */ #else /* _WIN32 */
HANDLE qemu_event_handle = NULL; static HANDLE qemu_event_handle = NULL;
static void dummy_event_handler(void *opaque) static void dummy_event_handler(void *opaque)
{ {

2
qemu_socket.h
View File

@ -8,7 +8,9 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#define socket_error() WSAGetLastError() #define socket_error() WSAGetLastError()
#undef EWOULDBLOCK
#undef EINTR #undef EINTR
#undef EINPROGRESS
#define EWOULDBLOCK WSAEWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK
#define EINTR WSAEINTR #define EINTR WSAEINTR
#define EINPROGRESS WSAEINPROGRESS #define EINPROGRESS WSAEINPROGRESS

3
qtest.c
View File

@ -156,7 +156,8 @@ static void qtest_send_prefix(CharDriverState *chr)
tv.tv_sec, tv.tv_usec); 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; va_list ap;
char buffer[1024]; char buffer[1024];