qapi: g_hash_table_find() instead of GHashTableIter.

[qemu.git] / osdep.h

diff --git a/osdep.h b/osdep.h
index 671628114abcb42f9788f94aaaf616967213a212..428285c7e0ef0d1a91a5c2937ed3f011c403a7bf 100644 (file)
--- a/osdep.h
+++ b/osdep.h
@@ -8,9 +8,7 @@
 #include <sys/signal.h>
 #endif
 
 #include <sys/signal.h>
 #endif
 

-#ifndef _WIN32

 #include <sys/time.h>
 #include <sys/time.h>

-#endif

 
 #ifndef glue
 #define xglue(x, y) x ## y
 
 #ifndef glue
 #define xglue(x, y) x ## y


@@ -28,9 +26,6 @@
 #define unlikely(x)   __builtin_expect(!!(x), 0)
 #endif
 
 #define unlikely(x)   __builtin_expect(!!(x), 0)
 #endif
 

-#ifdef CONFIG_NEED_OFFSETOF
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *) 0)->MEMBER)
-#endif

 #ifndef container_of
 #define container_of(ptr, type, member) ({                      \
         const typeof(((type *) 0)->member) *__mptr = (ptr);     \
 #ifndef container_of
 #define container_of(ptr, type, member) ({                      \
         const typeof(((type *) 0)->member) *__mptr = (ptr);     \


@@ -57,6 +52,10 @@
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 #endif
 
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 #endif
 

+#ifndef DIV_ROUND_UP
+#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
+#endif
+

 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif


@@ -71,21 +70,9 @@
 #define inline always_inline
 #endif
 
 #define inline always_inline
 #endif
 

-#ifdef __i386__
-#define REGPARM __attribute((regparm(3)))
-#else
-#define REGPARM
-#endif
-

 #define qemu_printf printf
 
 #define qemu_printf printf
 

-#if defined (__GNUC__) && defined (__GNUC_MINOR__)
-# define QEMU_GNUC_PREREQ(maj, min) \
-         ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#else
-# define QEMU_GNUC_PREREQ(maj, min) 0
-#endif
-
+int qemu_daemon(int nochdir, int noclose);

 void *qemu_memalign(size_t alignment, size_t size);
 void *qemu_vmalloc(size_t size);
 void qemu_vfree(void *ptr);
 void *qemu_memalign(size_t alignment, size_t size);
 void *qemu_vmalloc(size_t size);
 void qemu_vfree(void *ptr);


@@ -125,21 +112,34 @@ void qemu_vfree(void *ptr);
 
 int qemu_madvise(void *addr, size_t len, int advice);
 
 
 int qemu_madvise(void *addr, size_t len, int advice);
 

+#if defined(__HAIKU__) && defined(__i386__)
+#define FMT_pid "%ld"
+#elif defined(WIN64)
+#define FMT_pid "%" PRId64
+#else
+#define FMT_pid "%d"
+#endif
+

 int qemu_create_pidfile(const char *filename);
 int qemu_create_pidfile(const char *filename);

+int qemu_get_thread_id(void);

 
 #ifdef _WIN32
 
 #ifdef _WIN32

-int ffs(int i);
-
-int setenv(const char *name, const char *value, int overwrite);
-
-typedef struct {
-    long tv_sec;
-    long tv_usec;
-} qemu_timeval;
-int qemu_gettimeofday(qemu_timeval *tp);
+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
 #else

-typedef struct timeval qemu_timeval;
-#define qemu_gettimeofday(tp) gettimeofday(tp, NULL);
-#endif /* !_WIN32 */
+#define qemu_timersub timersub
+#endif
+
+void qemu_set_cloexec(int fd);

 
 #endif
 
 #endif