[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 66/74] sun4m: Pass SPARCCPU to {main, secondary}_cpu
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 66/74] sun4m: Pass SPARCCPU to {main, secondary}_cpu_reset() |
Date: |
Tue, 5 Jun 2012 03:22:38 +0200 |
We can now use cpu_reset() in place of cpu_state_reset().
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Blue Swirl <address@hidden>
---
hw/sun4m.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/sun4m.c b/hw/sun4m.c
index c5d2e40..a959261 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -281,17 +281,19 @@ static void dummy_cpu_set_irq(void *opaque, int irq, int
level)
static void main_cpu_reset(void *opaque)
{
- CPUSPARCState *env = opaque;
+ SPARCCPU *cpu = opaque;
+ CPUSPARCState *env = &cpu->env;
- cpu_state_reset(env);
+ cpu_reset(CPU(cpu));
env->halted = 0;
}
static void secondary_cpu_reset(void *opaque)
{
- CPUSPARCState *env = opaque;
+ SPARCCPU *cpu = opaque;
+ CPUSPARCState *env = &cpu->env;
- cpu_state_reset(env);
+ cpu_reset(CPU(cpu));
env->halted = 1;
}
@@ -821,9 +823,9 @@ static void cpu_devinit(const char *cpu_model, unsigned int
id,
cpu_sparc_set_id(env, id);
if (id == 0) {
- qemu_register_reset(main_cpu_reset, env);
+ qemu_register_reset(main_cpu_reset, cpu);
} else {
- qemu_register_reset(secondary_cpu_reset, env);
+ qemu_register_reset(secondary_cpu_reset, cpu);
env->halted = 1;
}
*cpu_irqs = qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS);
--
1.7.7
- [Qemu-devel] [PATCH 52/74] ppc4xx_devs: Use cpu_ppc_init() to obtain PowerPCCPU, (continued)
- [Qemu-devel] [PATCH 52/74] ppc4xx_devs: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 37/74] mips_fulong2e: Pass MIPSCPU to main_cpu_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 36/74] mips_fulong2e: Use cpu_mips_cpu() to obtain MIPSCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 35/74] target-mips: Let cpu_mips_init() return MIPSCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 64/74] target-sparc: Let cpu_sparc_init() return SPARCCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 65/74] sun4m: Use cpu_sparc_init() to obtain SPARCCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 38/74] mips_jazz: Use cpu_mips_init() to obtain MIPSCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 73/74] linux-user: Use cpu_reset() after cpu_init() / cpu_copy(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 54/74] ppc_newworld: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 55/74] ppc_newworld: Pass PowerPCCPU to ppc_core99_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 66/74] sun4m: Pass SPARCCPU to {main, secondary}_cpu_reset(),
Andreas Färber <=
- [Qemu-devel] [PATCH 45/74] mips_r4k: Store MIPSCPU in ResetData, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 50/74] ppc440_bamboo: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 53/74] ppc4xx_devs: Pass PowerPCCPU to ppc4xx_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 51/74] ppc440_bamboo: Pass PowerPCCPU to main_cpu_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 74/74] Kill off cpu_state_reset(), Andreas Färber, 2012/06/04
- Re: [Qemu-devel] [PULL] QOM CPUState, part 3: cpu_state_reset(), Anthony Liguori, 2012/06/06