From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 7 Sep 2011 13:02:15 +0000 (+0200)
Subject: Don't use g_thread_get_initialized.
X-Git-Tag: v1.0-rc0~327
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad8b818686623ea4ad300a7a144fcfb2bce77050;p=thirdparty%2Fqemu.git

Don't use g_thread_get_initialized.

Initialize glib threads unconditionally in main() instead
of using g_thread_get_initialized in the 9p code.

Fixes a build failure on RHEL-5, which ships glib 2.12.
g_thread_get_initialized was added in 2.20.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/9pfs/virtio-9p-coth.c b/hw/9pfs/virtio-9p-coth.c
index ae056586328..25556cc6a74 100644
--- a/hw/9pfs/virtio-9p-coth.c
+++ b/hw/9pfs/virtio-9p-coth.c
@@ -67,10 +67,6 @@ int v9fs_init_worker_threads(void)
     /* Leave signal handling to the iothread.  */
     pthread_sigmask(SIG_SETMASK, &set, &oldset);
 
-    /* init thread system if not already initialized */
-    if (!g_thread_get_initialized()) {
-        g_thread_init(NULL);
-    }
     if (qemu_pipe(notifier_fds) == -1) {
         ret = -1;
         goto err_out;
diff --git a/vl.c b/vl.c
index 5ba9b358606..6e998af0029 100644
--- a/vl.c
+++ b/vl.c
@@ -2200,6 +2200,7 @@ int main(int argc, char **argv, char **envp)
     error_set_progname(argv[0]);
 
     g_mem_set_vtable(&mem_trace);
+    g_thread_init(NULL);
 
     init_clocks();