target-i386: Fix x86_cpuid_set_model_id()

[qemu.git] / qemu-thread.h

diff --git a/qemu-thread.h b/qemu-thread.h
index 19bb30c9406c644f3c63d9fde21297c74c81bb03..a78a8f2524bf9affd5a476433b0bc2f69e6ccb53 100644 (file)
--- a/qemu-thread.h
+++ b/qemu-thread.h
@@ -1,44 +1,48 @@
 #ifndef __QEMU_THREAD_H
 #define __QEMU_THREAD_H 1
 #ifndef __QEMU_THREAD_H
 #define __QEMU_THREAD_H 1

-#include "semaphore.h"
-#include "pthread.h"

 
 

-struct QemuMutex {
-    pthread_mutex_t lock;
-};
-
-struct QemuCond {
-    pthread_cond_t cond;
-};
-
-struct QemuThread {
-    pthread_t thread;
-};
+#include <inttypes.h>

 
 typedef struct QemuMutex QemuMutex;
 typedef struct QemuCond QemuCond;
 typedef struct QemuThread QemuThread;
 
 
 typedef struct QemuMutex QemuMutex;
 typedef struct QemuCond QemuCond;
 typedef struct QemuThread QemuThread;
 

+#ifdef _WIN32
+#include "qemu-thread-win32.h"
+#else
+#include "qemu-thread-posix.h"
+#endif
+
+#define QEMU_THREAD_JOINABLE 0
+#define QEMU_THREAD_DETACHED 1
+

 void qemu_mutex_init(QemuMutex *mutex);
 void qemu_mutex_destroy(QemuMutex *mutex);
 void qemu_mutex_lock(QemuMutex *mutex);
 int qemu_mutex_trylock(QemuMutex *mutex);
 void qemu_mutex_init(QemuMutex *mutex);
 void qemu_mutex_destroy(QemuMutex *mutex);
 void qemu_mutex_lock(QemuMutex *mutex);
 int qemu_mutex_trylock(QemuMutex *mutex);

-int qemu_mutex_timedlock(QemuMutex *mutex, uint64_t msecs);

 void qemu_mutex_unlock(QemuMutex *mutex);
 
 void qemu_mutex_unlock(QemuMutex *mutex);
 

+#define rcu_read_lock() do { } while (0)
+#define rcu_read_unlock() do { } while (0)
+

 void qemu_cond_init(QemuCond *cond);
 void qemu_cond_destroy(QemuCond *cond);
 void qemu_cond_init(QemuCond *cond);
 void qemu_cond_destroy(QemuCond *cond);

+
+/*
+ * IMPORTANT: The implementation does not guarantee that pthread_cond_signal
+ * and pthread_cond_broadcast can be called except while the same mutex is
+ * held as in the corresponding pthread_cond_wait calls!
+ */

 void qemu_cond_signal(QemuCond *cond);
 void qemu_cond_broadcast(QemuCond *cond);
 void qemu_cond_wait(QemuCond *cond, QemuMutex *mutex);
 void qemu_cond_signal(QemuCond *cond);
 void qemu_cond_broadcast(QemuCond *cond);
 void qemu_cond_wait(QemuCond *cond, QemuMutex *mutex);

-int qemu_cond_timedwait(QemuCond *cond, QemuMutex *mutex, uint64_t msecs);

 
 void qemu_thread_create(QemuThread *thread,
 
 void qemu_thread_create(QemuThread *thread,

-                       void *(*start_routine)(void*),
-                       void *arg);
-void qemu_thread_signal(QemuThread *thread, int sig);
-void qemu_thread_self(QemuThread *thread);
-int qemu_thread_equal(QemuThread *thread1, QemuThread *thread2);
+                        void *(*start_routine)(void *),
+                        void *arg, int mode);
+void *qemu_thread_join(QemuThread *thread);
+void qemu_thread_get_self(QemuThread *thread);
+int qemu_thread_is_self(QemuThread *thread);

 void qemu_thread_exit(void *retval);
 
 #endif
 void qemu_thread_exit(void *retval);
 
 #endif