From 8ebdf9dcc6036171a9f8bac3fe8dc459725a3e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 3 May 2012 03:29:49 +0200 Subject: [PATCH] sun4u: Use cpu_sparc_init() to obtain SPARCCPU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This prepares using it in sun4uv_init(). Signed-off-by: Andreas Färber Acked-by: Blue Swirl --- hw/sun4u.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index 517bdb818d..92b616fe36 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);