From: Andreas Färber <afaerber@suse.de>
Date: Thu, 3 May 2012 01:14:37 +0000 (+0200)
Subject: sun4m: Use cpu_sparc_init() to obtain SPARCCPU
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8968f588e3e42183a49802f1fa18af0f95cf5ba5;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git

sun4m: Use cpu_sparc_init() to obtain SPARCCPU

Needed for {main,secondary}_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/hw/sun4m.c b/hw/sun4m.c
index 34088ad18..c5d2e4052 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -809,13 +809,15 @@ static TypeInfo ram_info = {
 static void cpu_devinit(const char *cpu_model, unsigned int id,
                         uint64_t prom_addr, qemu_irq **cpu_irqs)
 {
+    SPARCCPU *cpu;
     CPUSPARCState *env;
 
-    env = cpu_init(cpu_model);
-    if (!env) {
+    cpu = cpu_sparc_init(cpu_model);
+    if (cpu == NULL) {
         fprintf(stderr, "qemu: Unable to find Sparc CPU definition\n");
         exit(1);
     }
+    env = &cpu->env;
 
     cpu_sparc_set_id(env, id);
     if (id == 0) {