fix conflicts when merging no-thread to master

2016-04-23 10:06:57 +08:00
parent bb80e699b2 ba31be79f4
commit 3a742fb6f6
32 changed files with 27 additions and 322 deletions
--- a/qemu/util/qemu-thread-posix.c
+++ b/qemu/util/qemu-thread-posix.c
@ -426,16 +426,6 @@ int qemu_thread_create(struct uc_struct *uc, QemuThread *thread, const char *nam
    return 0;
 }

-void qemu_thread_get_self(struct uc_struct *uc, QemuThread *thread)
-{
-    thread->thread = pthread_self();
-}
-
-bool qemu_thread_is_self(QemuThread *thread)
-{
-   return pthread_equal(pthread_self(), thread->thread);
-}
-
 void qemu_thread_exit(struct uc_struct *uc, void *retval)
 {
    pthread_exit(retval);