[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 69/74] sun4u: Store SPARCCPU in ResetData
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 69/74] sun4u: Store SPARCCPU in ResetData |
Date: |
Tue, 5 Jun 2012 03:22:41 +0200 |
We can now use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Blue Swirl <address@hidden>
---
hw/sun4u.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/sun4u.c b/hw/sun4u.c
index e63ba39..137a7c6 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -342,7 +342,7 @@ static void cpu_set_ivec_irq(void *opaque, int irq, int
level)
}
typedef struct ResetData {
- CPUSPARCState *env;
+ SPARCCPU *cpu;
uint64_t prom_addr;
} ResetData;
@@ -395,10 +395,10 @@ static void cpu_timer_reset(CPUTimer *timer)
static void main_cpu_reset(void *opaque)
{
ResetData *s = (ResetData *)opaque;
- CPUSPARCState *env = s->env;
+ CPUSPARCState *env = &s->cpu->env;
static unsigned int nr_resets;
- cpu_state_reset(env);
+ cpu_reset(CPU(s->cpu));
cpu_timer_reset(env->tick);
cpu_timer_reset(env->stick);
@@ -782,7 +782,7 @@ static SPARCCPU *cpu_devinit(const char *cpu_model, const
struct hwdef *hwdef)
hstick_frequency, TICK_INT_DIS);
reset_info = g_malloc0(sizeof(ResetData));
- reset_info->env = env;
+ reset_info->cpu = cpu;
reset_info->prom_addr = hwdef->prom_addr;
qemu_register_reset(main_cpu_reset, reset_info);
--
1.7.7
- [Qemu-devel] [PATCH 29/74] pc: Pass X86CPU to pc_cpu_reset(), (continued)
- [Qemu-devel] [PATCH 29/74] pc: Pass X86CPU to pc_cpu_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 33/74] target-mips: Use cpu_reset() in cpu_mips_init(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 43/74] mips_mipssim: Store MIPSCPU in ResetData, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 42/74] mips_mipssim: Use cpu_mips_init() to obtain MIPSCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 44/74] mips_r4k: Use cpu_mips_init() to obtain MIPSCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 40/74] mips_malta: Use cpu_mips_init() to obtain MIPSCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 60/74] virtex_ml507: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 58/74] ppc_prep: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 59/74] ppc_prep: Pass PowerPCCPU to ppc_prep_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 70/74] leon3: Use cpu_sparc_init() to obtain SPARCCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 69/74] sun4u: Store SPARCCPU in ResetData,
Andreas Färber <=
- [Qemu-devel] [PATCH 67/74] sun4u: Use cpu_sparc_init() to obtain SPARCCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 71/74] leon3: Store SPARCCPU in ResetData, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 68/74] sun4u: Let cpu_devinit() return SPARCCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 72/74] bsd-user: Use cpu_reset() in after cpu_init(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 34/74] target-mips: Use cpu_reset() in do_interrupt(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 63/74] cpu-exec: Use cpu_reset() in cpu_exec() for TARGET_PPC, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 61/74] virtex_ml507: Let ppc440_init_xilinx() return PowerPCCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 47/74] ppce500_mpc8544ds: Pass PowerPCCPU to mpc8544ds_cpu_reset[_sec], Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 56/74] ppc_oldworld: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 57/74] ppc_oldworld: Pass PowerPCCPU to ppc_heathrow_reset(), Andreas Färber, 2012/06/04