diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-01 17:29:24 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-01 17:29:24 -0500 |
| commit | 8aceefd77c2bb5af02759d11eb836c42ad9e720d (patch) | |
| tree | 06eef615cd364695d19e568a5f3029911a1298fe /vl.c | |
| parent | ef26ee0e6c67d415f8b22850f9f13a972ada8be1 (diff) | |
| parent | 13766eb1e46452affd12f2b944730e136c6a2dda (diff) | |
| download | focaccia-qemu-8aceefd77c2bb5af02759d11eb836c42ad9e720d.tar.gz focaccia-qemu-8aceefd77c2bb5af02759d11eb836c42ad9e720d.zip | |
Merge remote-tracking branch 'afaerber/cocoa-for-upstream' into staging
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 4 |
1 files changed, 3 insertions, 1 deletions
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(); |