[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH next v2 14/74] leon3: Store SPARCCPU in ResetData
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH next v2 14/74] leon3: Store SPARCCPU in ResetData |
Date: |
Thu, 10 May 2012 02:13:52 +0200 |
Allows us to use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().
Signed-off-by: Andreas Färber <address@hidden>
---
hw/leon3.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/leon3.c b/hw/leon3.c
index 8ffef83..878d3aa 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -42,16 +42,16 @@
#define MAX_PILS 16
typedef struct ResetData {
- CPUSPARCState *env;
+ SPARCCPU *cpu;
uint32_t entry; /* save kernel entry in case of reset */
} ResetData;
static void main_cpu_reset(void *opaque)
{
ResetData *s = (ResetData *)opaque;
- CPUSPARCState *env = s->env;
+ CPUSPARCState *env = &s->cpu->env;
- cpu_state_reset(env);
+ cpu_reset(CPU(s->cpu));
env->halted = 0;
env->pc = s->entry;
@@ -129,7 +129,7 @@ static void leon3_generic_hw_init(ram_addr_t ram_size,
/* Reset data */
reset_info = g_malloc0(sizeof(ResetData));
- reset_info->env = env;
+ reset_info->cpu = cpu;
qemu_register_reset(main_cpu_reset, reset_info);
/* Allocate IRQ manager */
--
1.7.7
- [Qemu-devel] [PATCH next v2 02/74] target-mips: Use cpu_reset() in cpu_mips_init(), (continued)
- [Qemu-devel] [PATCH next v2 02/74] target-mips: Use cpu_reset() in cpu_mips_init(), Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 00/74] QOM CPUState, part 3: CPU reset, Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 01/74] target-arm: Use cpu_reset() in cpu_arm_init(), Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 02/74] target-mips: Use cpu_reset() in cpu_mips_init(), Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 03/74] target-i386: Pass X86CPU to do_cpu_{init, sipi}(), Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 07/74] target-sparc: Let cpu_sparc_init() return SPARCCPU, Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 05/74] pc: Use cpu_x86_init() to obtain X86CPU, Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 06/74] pc: Pass X86CPU to pc_cpu_reset(), Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 04/74] target-i386: Let cpu_x86_init() return X86CPU, Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 08/74] sun4m: Use cpu_sparc_init() to obtain SPARCCPU, Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 14/74] leon3: Store SPARCCPU in ResetData,
Andreas Färber <=
- [Qemu-devel] [PATCH next v2 12/74] sun4u: Store SPARCCPU in ResetData, Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 11/74] sun4u: Let cpu_devinit() return SPARCCPU, Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 09/74] sun4m: Pass SPARCCPU to {main, secondary}_cpu_reset(), Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 17/74] spapr: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 15/74] target-ppc: Let cpu_ppc_init() return PowerPCCPU, Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 21/74] ppc4xx_devs: Use cpu_ppc_init() to obtain PowerPCCPU, Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 20/74] ppc440_bamboo: Pass PowerPCCPU to main_cpu_reset(), Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 13/74] leon3: Use cpu_sparc_init() to obtain SPARCCPU, Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 18/74] spapr: Pass PowerPCCPU to spapr_cpu_reset(), Andreas Färber, 2012/05/09
- [Qemu-devel] [PATCH next v2 22/74] ppc4xx_devs: Pass PowerPCCPU to ppc4xx_reset(), Andreas Färber, 2012/05/09