summary refs log tree commit diff stats
path: root/hw/leon3.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-03-14 01:38:24 +0100
committerAndreas Färber <afaerber@suse.de>2012-03-14 22:20:26 +0100
commit98cec4a2e6d8bf72a2798036397049b5e906e49c (patch)
tree3ac76b30daa02c7518f9768edcfb10fef1c064df /hw/leon3.c
parent0b7ade1d3e02aa7c5b2e8f4aa7de6d836759b39d (diff)
downloadfocaccia-qemu-98cec4a2e6d8bf72a2798036397049b5e906e49c.tar.gz
focaccia-qemu-98cec4a2e6d8bf72a2798036397049b5e906e49c.zip
sparc hw/: Don't use CPUState
Scripted conversion:
  for file in hw/sun4m.c hw/sun4u.c hw/grlib.h hw/leon3.c; do
    sed -i "s/CPUState/CPUSPARCState/g" $file
  done

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/leon3.c')
-rw-r--r--hw/leon3.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/leon3.c b/hw/leon3.c
index 1dc5a02327..0a5ff165a1 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -42,14 +42,14 @@
 #define MAX_PILS 16
 
 typedef struct ResetData {
-    CPUState *env;
+    CPUSPARCState *env;
     uint32_t  entry;            /* save kernel entry in case of reset */
 } ResetData;
 
 static void main_cpu_reset(void *opaque)
 {
     ResetData *s   = (ResetData *)opaque;
-    CPUState  *env = s->env;
+    CPUSPARCState  *env = s->env;
 
     cpu_state_reset(env);
 
@@ -65,7 +65,7 @@ void leon3_irq_ack(void *irq_manager, int intno)
 
 static void leon3_set_pil_in(void *opaque, uint32_t pil_in)
 {
-    CPUState *env = (CPUState *)opaque;
+    CPUSPARCState *env = (CPUSPARCState *)opaque;
 
     assert(env != NULL);
 
@@ -101,7 +101,7 @@ static void leon3_generic_hw_init(ram_addr_t  ram_size,
                                   const char *initrd_filename,
                                   const char *cpu_model)
 {
-    CPUState   *env;
+    CPUSPARCState   *env;
     MemoryRegion *address_space_mem = get_system_memory();
     MemoryRegion *ram = g_new(MemoryRegion, 1);
     MemoryRegion *prom = g_new(MemoryRegion, 1);