commit db529aabfac17201d3647384abf89fc7f272b493
author Andreas Färber <andreas.faerber@web.de> Mon Oct 31 19:14:56 2011 +0100
committer Andreas Färber <andreas.faerber@web.de> Tue Nov 01 20:41:06 2011 +0100
tree cbdf7ccbeb66de77059de7b28332ef70435dd412
parent 351f1bf6fc9f02cd2ef341f853f7bb55d05974ec

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>

vl.c

diff --git a/vl.c b/vl.c
index b56e0cb..624da0f 100644
--- a/vl.c
+++ b/vl.c
@@ -2185,7 +2185,9 @@
     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();