ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/i386/helper: Shuffle do_cpu_init() 

Move the #ifdef'ry inside do_cpu_init() instead of
declaring an empty stub for user emulation.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230602224628.59546-3-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-06-03 00:31:40 +02:00
parent 3b8484c5d2
commit 6d70b36b02
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/i386/helper.c
View File

@ -580,9 +580,9 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector,
return 1; return 1;
} }
#if !defined(CONFIG_USER_ONLY)
void do_cpu_init(X86CPU *cpu) void do_cpu_init(X86CPU *cpu)
{ {
#if !defined(CONFIG_USER_ONLY)
CPUState *cs = CPU(cpu); CPUState *cs = CPU(cpu);
CPUX86State *env = &cpu->env; CPUX86State *env = &cpu->env;
CPUX86State *save = g_new(CPUX86State, 1); CPUX86State *save = g_new(CPUX86State, 1);
@ -601,19 +601,15 @@ void do_cpu_init(X86CPU *cpu)
kvm_arch_do_init_vcpu(cpu); kvm_arch_do_init_vcpu(cpu);
} }
apic_init_reset(cpu->apic_state); apic_init_reset(cpu->apic_state);
#endif /* CONFIG_USER_ONLY */
} }
#ifndef CONFIG_USER_ONLY
void do_cpu_sipi(X86CPU *cpu) void do_cpu_sipi(X86CPU *cpu)
{ {
apic_sipi(cpu->apic_state); apic_sipi(cpu->apic_state);
} }
#else
void do_cpu_init(X86CPU *cpu)
{
}
#endif
#ifndef CONFIG_USER_ONLY
void cpu_load_efer(CPUX86State *env, uint64_t val) void cpu_load_efer(CPUX86State *env, uint64_t val)
{ {