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/unicorn_common.h
+++ b/qemu/unicorn_common.h
@ -112,7 +112,6 @@ static inline void uc_common_init(struct uc_struct* uc)
    uc->tcg_enabled = tcg_enabled;
    uc->tcg_exec_init = tcg_exec_init;
    uc->cpu_exec_init_all = cpu_exec_init_all;
-    uc->pause_all_vcpus = pause_all_vcpus;
    uc->vm_start = vm_start;
    uc->memory_map = memory_map;
    uc->memory_map_ptr = memory_map_ptr;