diff options
author | Andreas Färber <afaerber@suse.de> | 2012-05-02 19:37:34 +0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:42 +0200 |
commit | e5fe7a34d421eb97fc3b69f58d8e91f4679ffb41 (patch) | |
tree | d0fde98dd552beb2a260bc74bfd568569d1db7a4 /hw | |
parent | 608911acac53f08dfaaf1878f56d4e32ee572ce4 (diff) | |
download | hqemu-e5fe7a34d421eb97fc3b69f58d8e91f4679ffb41.zip hqemu-e5fe7a34d421eb97fc3b69f58d8e91f4679ffb41.tar.gz |
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>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/pc.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -926,9 +926,10 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) 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); } @@ -946,8 +947,8 @@ static X86CPU *pc_new_cpu(const char *cpu_model) if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) { env->apic_state = apic_init(env, env->cpuid_apic_id); } - qemu_register_reset(pc_cpu_reset, env); - pc_cpu_reset(env); + qemu_register_reset(pc_cpu_reset, cpu); + pc_cpu_reset(cpu); return cpu; } |