From: Andreas Färber <andreas.faerber@web.de>
Date: Mon, 31 Oct 2011 18:14:56 +0000 (+0100)
Subject: vl.c: Guard against GThread double-initialization
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=db529aabfac17201d3647384abf89fc7f272b493;p=qemu.git

vl.c: Guard against GThread double-initialization

GThread-ERROR **: GThread system may only be initialized once.
aborting...

Making the g_thread_init() call in vl.c conditional resolves an abort on
Mac OS X, where coroutine-gthread.c seems to call it before vl.c.

Reported-by: Juan Pineda <juan@logician.com>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Cc: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/vl.c b/vl.c
index b56e0cb378..624da0fd3c 100644
--- a/vl.c
+++ b/vl.c
@@ -2185,7 +2185,9 @@ int main(int argc, char **argv, char **envp)
     error_set_progname(argv[0]);
 
     g_mem_set_vtable(&mem_trace);
-    g_thread_init(NULL);
+    if (!g_thread_supported()) {
+        g_thread_init(NULL);
+    }
 
     runstate_init();