target-i386: Pass X86CPU to cpu_x86_load_seg_cache_sipi()
Simplifies the call in apic_sipi() again and needed for moving halted field to CPUState. Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
This commit is contained in:
parent
60671e583c
commit
e9f9d6b165
|
@ -487,7 +487,7 @@ void apic_sipi(DeviceState *d)
|
||||||
|
|
||||||
if (!s->wait_for_sipi)
|
if (!s->wait_for_sipi)
|
||||||
return;
|
return;
|
||||||
cpu_x86_load_seg_cache_sipi(&s->cpu->env, s->sipi_vector);
|
cpu_x86_load_seg_cache_sipi(s->cpu, s->sipi_vector);
|
||||||
s->wait_for_sipi = 0;
|
s->wait_for_sipi = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -907,9 +907,11 @@ static inline void cpu_x86_load_seg_cache(CPUX86State *env,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void cpu_x86_load_seg_cache_sipi(CPUX86State *env,
|
static inline void cpu_x86_load_seg_cache_sipi(X86CPU *cpu,
|
||||||
int sipi_vector)
|
int sipi_vector)
|
||||||
{
|
{
|
||||||
|
CPUX86State *env = &cpu->env;
|
||||||
|
|
||||||
env->eip = 0;
|
env->eip = 0;
|
||||||
cpu_x86_load_seg_cache(env, R_CS, sipi_vector << 8,
|
cpu_x86_load_seg_cache(env, R_CS, sipi_vector << 8,
|
||||||
sipi_vector << 12,
|
sipi_vector << 12,
|
||||||
|
|
Loading…
Reference in a new issue