mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 00:33:55 -06:00
target-i386: Pass X86CPU to do_cpu_{init,sipi}()
Allows to use cpu_reset() in place of cpu_state_reset(). Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
This commit is contained in:
parent
bf494367fa
commit
232fc23bed
4 changed files with 16 additions and 11 deletions
|
@ -1187,27 +1187,30 @@ CPUX86State *cpu_x86_init(const char *cpu_model)
|
|||
}
|
||||
|
||||
#if !defined(CONFIG_USER_ONLY)
|
||||
void do_cpu_init(CPUX86State *env)
|
||||
void do_cpu_init(X86CPU *cpu)
|
||||
{
|
||||
CPUX86State *env = &cpu->env;
|
||||
int sipi = env->interrupt_request & CPU_INTERRUPT_SIPI;
|
||||
uint64_t pat = env->pat;
|
||||
|
||||
cpu_state_reset(env);
|
||||
cpu_reset(CPU(cpu));
|
||||
env->interrupt_request = sipi;
|
||||
env->pat = pat;
|
||||
apic_init_reset(env->apic_state);
|
||||
env->halted = !cpu_is_bsp(env);
|
||||
}
|
||||
|
||||
void do_cpu_sipi(CPUX86State *env)
|
||||
void do_cpu_sipi(X86CPU *cpu)
|
||||
{
|
||||
CPUX86State *env = &cpu->env;
|
||||
|
||||
apic_sipi(env->apic_state);
|
||||
}
|
||||
#else
|
||||
void do_cpu_init(CPUX86State *env)
|
||||
void do_cpu_init(X86CPU *cpu)
|
||||
{
|
||||
}
|
||||
void do_cpu_sipi(CPUX86State *env)
|
||||
void do_cpu_sipi(X86CPU *cpu)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue