Merge remote branch 'qemu-kvm/uq/master' into staging

diff --cc cpus.c
Simple merge

diff --cc monitor.c
Simple merge

diff --cc osdep.h
index 5e4886030e0355f9c5e514e95f8add3cf066ffa8,748df5416ba26edb4258fa2aaab3afc999e70e15..970d767078b6760e3da4cd6489d011bf6e34de34
--- 1/osdep.h
--- 2/osdep.h
+++ b/osdep.h
@@@ -128,22 -130,6 +128,23 @@@ void qemu_vfree(void *ptr)
  int qemu_madvise(void *addr, size_t len, int advice);
  
  int qemu_create_pidfile(const char *filename);
+ int qemu_get_thread_id(void);
  
 +#ifdef _WIN32
 +static inline void qemu_timersub(const struct timeval *val1,
 +                                 const struct timeval *val2,
 +                                 struct timeval *res)
 +{
 +    res->tv_sec = val1->tv_sec - val2->tv_sec;
 +    if (val1->tv_usec < val2->tv_usec) {
 +        res->tv_sec--;
 +        res->tv_usec = val1->tv_usec - val2->tv_usec + 1000 * 1000;
 +    } else {
 +        res->tv_usec = val1->tv_usec - val2->tv_usec;
 +    }
 +}
 +#else
 +#define qemu_timersub timersub
 +#endif
 +
  #endif

diff --cc target-ppc/kvm.c
Simple merge

diff --cc vl.c
Simple merge