mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53:54 -06:00
Merge branch 'x86cpu_qom_tcg_v2' of git://github.com/imammedo/qemu
* 'x86cpu_qom_tcg_v2' of git://github.com/imammedo/qemu: target-i386: move tcg initialization into x86_cpu_initfn() cleanup cpu_set_debug_excp_handler target-xtensa: drop usage of prev_debug_excp_handler target-i386: drop usage of prev_debug_excp_handler
This commit is contained in:
commit
d3da41e32b
6 changed files with 15 additions and 27 deletions
|
@ -1746,6 +1746,7 @@ static void x86_cpu_initfn(Object *obj)
|
|||
{
|
||||
X86CPU *cpu = X86_CPU(obj);
|
||||
CPUX86State *env = &cpu->env;
|
||||
static int inited;
|
||||
|
||||
cpu_exec_init(env);
|
||||
|
||||
|
@ -1775,6 +1776,15 @@ static void x86_cpu_initfn(Object *obj)
|
|||
x86_cpuid_set_tsc_freq, NULL, NULL, NULL);
|
||||
|
||||
env->cpuid_apic_id = env->cpu_index;
|
||||
|
||||
/* init various static tables used in TCG mode */
|
||||
if (tcg_enabled() && !inited) {
|
||||
inited = 1;
|
||||
optimize_flags_init();
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
cpu_set_debug_excp_handler(breakpoint_handler);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue