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

pc: Pass X86CPU to pc_cpu_reset() 

Allows us 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:
Andreas Färber 2012-05-02 19:37:34 +02:00
parent 608911acac
commit e5fe7a34d4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/pc.c
View File

@ -926,9 +926,10 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level)
static void pc_cpu_reset(void *opaque) static void pc_cpu_reset(void *opaque)
{ {
CPUX86State *env = opaque; X86CPU *cpu = opaque;
CPUX86State *env = &cpu->env;
cpu_state_reset(env); cpu_reset(CPU(cpu));
env->halted = !cpu_is_bsp(env); env->halted = !cpu_is_bsp(env);
} }
@ -946,8 +947,8 @@ static X86CPU *pc_new_cpu(const char *cpu_model)
if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) { if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) {
env->apic_state = apic_init(env, env->cpuid_apic_id); env->apic_state = apic_init(env, env->cpuid_apic_id);
} }
qemu_register_reset(pc_cpu_reset, env); qemu_register_reset(pc_cpu_reset, cpu);
pc_cpu_reset(env); pc_cpu_reset(cpu);
return cpu; return cpu;
} }