[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 67/74] sun4u: Use cpu_sparc_init() to obtain SPARCCP
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 67/74] sun4u: Use cpu_sparc_init() to obtain SPARCCPU |
Date: |
Tue, 5 Jun 2012 03:22:39 +0200 |
This prepares using it in sun4uv_init().
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Blue Swirl <address@hidden>
---
hw/sun4u.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/sun4u.c b/hw/sun4u.c
index 517bdb8..92b616f 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -754,6 +754,7 @@ static TypeInfo ram_info = {
static CPUSPARCState *cpu_devinit(const char *cpu_model, const struct hwdef
*hwdef)
{
+ SPARCCPU *cpu;
CPUSPARCState *env;
ResetData *reset_info;
@@ -761,13 +762,15 @@ static CPUSPARCState *cpu_devinit(const char *cpu_model,
const struct hwdef *hwd
uint32_t stick_frequency = 100*1000000;
uint32_t hstick_frequency = 100*1000000;
- if (!cpu_model)
+ if (cpu_model == NULL) {
cpu_model = hwdef->default_cpu_model;
- env = cpu_init(cpu_model);
- if (!env) {
+ }
+ cpu = cpu_sparc_init(cpu_model);
+ if (cpu == NULL) {
fprintf(stderr, "Unable to find Sparc CPU definition\n");
exit(1);
}
+ env = &cpu->env;
env->tick = cpu_timer_create("tick", env, tick_irq,
tick_frequency, TICK_NPT_MASK);
--
1.7.7
- [Qemu-devel] [PATCH 33/74] target-mips: Use cpu_reset() in cpu_mips_init(), (continued)
- [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, 2012/06/04
- [Qemu-devel] [PATCH 67/74] sun4u: Use cpu_sparc_init() to obtain SPARCCPU,
Andreas Färber <=
- [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
- [Qemu-devel] [PATCH 39/74] mips_jazz: Pass MIPSCPU to main_cpu_reset(), Andreas Färber, 2012/06/04