fix conflicts when merging no-thread to master

2016-04-23 10:06:57 +08:00
parent bb80e699b2 ba31be79f4
commit 3a742fb6f6
32 changed files with 27 additions and 322 deletions
--- a/qemu/vl.c
+++ b/qemu/vl.c
@ -123,7 +123,6 @@ int machine_initialize(struct uc_struct *uc)
    configure_accelerator(current_machine);

    qemu_init_cpu_loop(uc);
-    qemu_mutex_lock_iothread(uc);

    current_machine->cpu_model = NULL;