vga: fix -nodefaults -device VGA

[qemu.git] / coroutine-gthread.c

diff --git a/coroutine-gthread.c b/coroutine-gthread.c
index b00e548b2d73fa2d945c0e68dc5ab42a3a3595b0..662801b2fa27e94fd84165dc96b1299291f8649c 100644 (file)
--- a/coroutine-gthread.c
+++ b/coroutine-gthread.c
@@ -36,7 +36,12 @@ static GStaticPrivate coroutine_key = G_STATIC_PRIVATE_INIT;
 static void __attribute__((constructor)) coroutine_init(void)
 {
     if (!g_thread_supported()) {
+#if !GLIB_CHECK_VERSION(2, 31, 0)
         g_thread_init(NULL);
+#else
+        fprintf(stderr, "glib threading failed to initialize.\n");
+        exit(1);
+#endif
     }
 
     coroutine_cond = g_cond_new();
@@ -117,7 +122,7 @@ Coroutine *qemu_coroutine_self(void)
     if (!co) {
         co = g_malloc0(sizeof(*co));
         co->runnable = true;
-        g_static_private_set(&coroutine_key, co, (GDestroyNotify)qemu_free);
+        g_static_private_set(&coroutine_key, co, (GDestroyNotify)g_free);
     }
 
     return &co->base;