From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 21 Mar 2011 22:42:20 +0000 (-0500)
Subject: Merge remote branch 'qemu-kvm/uq/master' into staging
X-Git-Tag: v0.15.0-rc0~684
X-Git-Url: https://git.proxmox.com/?p=qemu.git;a=commitdiff_plain;h=31b7c261a207e1e670d737ec78a87dd031bd8f73

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

31b7c261a207e1e670d737ec78a87dd031bd8f73
diff --cc osdep.h
index 5e4886030,748df5416..970d76707
--- a/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