yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts when merging no-thread to master

Browse Source
This commit is contained in:
Nguyen Anh Quynh
2016-04-23 10:06:57 +08:00
parent bb80e699b2 ba31be79f4
commit 3a742fb6f6
32 changed files with 27 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qemu/header_gen.py
View File

@ -2264,7 +2264,6 @@ symbols = (
'parse_value',
'par_write',
'patch_reloc',
'pause_all_vcpus',
'phys_map_node_alloc',
'phys_map_node_reserve',
'phys_mem_alloc',
@ -2423,8 +2422,7 @@ symbols = (
'qemu_clock_get_us',
'qemu_clock_ptr',
'qemu_clocks',
'qemu_cpu_is_self',
'qemu_cpu_kick_thread',
'qemu_cond_destroy',
'qemu_daemon',
'qemu_event_destroy',
'qemu_event_init',
@ -2520,9 +2518,7 @@ symbols = (
'qemu_st_helpers',
'qemu_strnlen',
'qemu_strsep',
'qemu_tcg_cpu_thread_fn',
'qemu_tcg_init_vcpu',
'qemu_thread_exit',
'qemu_try_memalign',
'qentry_destroy',
'qerror_human',