aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2011-09-07 15:02:15 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2011-09-09 12:58:16 -0500
commitad8b818686623ea4ad300a7a144fcfb2bce77050 (patch)
tree706b41ac40044cc93806860aaffc50ec43875291
parent36b586284e678da28df3af9fd0907d2b16f9311c (diff)
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>
-rw-r--r--hw/9pfs/virtio-9p-coth.c4
-rw-r--r--vl.c1
2 files changed, 1 insertions, 4 deletions
diff --git a/hw/9pfs/virtio-9p-coth.c b/hw/9pfs/virtio-9p-coth.c
index ae05658632..25556cc6a7 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 5ba9b35860..6e998af002 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();