[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-next 06/74] pc: Pass X86CPU to pc_cpu_reset()
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-next 06/74] pc: Pass X86CPU to pc_cpu_reset() |
Date: |
Sun, 6 May 2012 17:34:06 +0200 |
Allows us to use cpu_reset() in place of cpu_state_reset().
Signed-off-by: Andreas Färber <address@hidden>
---
hw/pc.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 4715f7a..4167782 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -934,9 +934,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);
}
@@ -954,8 +955,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;
}
--
1.7.7
- [Qemu-devel] [PATCH for-next 00/74] QOM CPUState, part 3: CPU reset, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 01/74] target-arm: Use cpu_reset() in cpu_arm_init(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 04/74] target-i386: Let cpu_x86_init() return X86CPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 05/74] pc: Use cpu_x86_init() to obtain X86CPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 02/74] target-mips: Use cpu_reset() in cpu_mips_init(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 08/74] sun4m: Use cpu_sparc_init() to obtain SPARCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 06/74] pc: Pass X86CPU to pc_cpu_reset(),
Andreas Färber <=
- [Qemu-devel] [PATCH for-next 03/74] target-i386: Pass X86CPU to do_cpu_{init, sipi}(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 07/74] target-sparc: Let cpu_sparc_init() return SPARCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 10/74] sun4u: Use cpu_sparc_init() to obtain SPARCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 16/74] ppce500_mpc8544ds: Pass PowerPCCPU to mpc8544ds_cpu_reset[_sec], Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 19/74] ppc440_bamboo: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 12/74] sun4u: Store SPARCCPU in ResetData, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 14/74] leon3: Store SPARCCPU in ResetData, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 11/74] sun4u: Let cpu_devinit() return SPARCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 13/74] leon3: Use cpu_sparc_init() to obtain SPARCCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 21/74] ppc4xx_devs: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/05/06