summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-10-30 00:17:12 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2012-10-30 09:30:52 +0100
commit1c53786fbdbdf20a3a6c556e09abb4d63ee7843e (patch)
tree6c53c848a78cd0dc59f0ac0a16c0c7c0ff31457f
parentd0cc2fbfa607678866475383c508be84818ceb64 (diff)
downloadfocaccia-qemu-1c53786fbdbdf20a3a6c556e09abb4d63ee7843e.tar.gz
focaccia-qemu-1c53786fbdbdf20a3a6c556e09abb4d63ee7843e.zip
vl: init main loop earlier
Otherwise, chardevs will not be able to create a bottom half as soon
as that will require an AioContext.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--vl.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/vl.c b/vl.c
index b3186fa425..f84e969a03 100644
--- a/vl.c
+++ b/vl.c
@@ -3311,6 +3311,12 @@ int main(int argc, char **argv, char **envp)
     }
     loc_set_none();
 
+    qemu_init_cpu_loop();
+    if (qemu_init_main_loop()) {
+        fprintf(stderr, "qemu_init_main_loop failed\n");
+        exit(1);
+    }
+
     if (qemu_opts_foreach(qemu_find_opts("sandbox"), parse_sandbox, NULL, 0)) {
         exit(1);
     }
@@ -3463,12 +3469,6 @@ int main(int argc, char **argv, char **envp)
 
     configure_accelerator();
 
-    qemu_init_cpu_loop();
-    if (qemu_init_main_loop()) {
-        fprintf(stderr, "qemu_init_main_loop failed\n");
-        exit(1);
-    }
-
     machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
     if (machine_opts) {
         kernel_filename = qemu_opt_get(machine_opts, "kernel");