summary refs log tree commit diff stats
path: root/hw/r2d.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-03-14 01:38:23 +0100
committerAndreas Färber <afaerber@suse.de>2012-03-14 22:20:26 +0100
commit0b7ade1d3e02aa7c5b2e8f4aa7de6d836759b39d (patch)
treef09340b7cfc400dd0baa32c85d4b2c32be1d463d /hw/r2d.c
parent0e4213a7ef630e1de4c7fc0bd6ff9ecc6e07daea (diff)
downloadfocaccia-qemu-0b7ade1d3e02aa7c5b2e8f4aa7de6d836759b39d.tar.gz
focaccia-qemu-0b7ade1d3e02aa7c5b2e8f4aa7de6d836759b39d.zip
sh4 hw/: Don't use CPUState
Scripted conversion:
  for file in hw/sh.h hw/shix.c hw/r2d.c; do
    sed -i "s/CPUState/CPUSH4State/g" $file
  done

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/r2d.c')
-rw-r--r--hw/r2d.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/r2d.c b/hw/r2d.c
index ae327a73f3..c55de0141b 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -192,14 +192,14 @@ static qemu_irq *r2d_fpga_init(MemoryRegion *sysmem,
 }
 
 typedef struct ResetData {
-    CPUState *env;
+    CPUSH4State *env;
     uint32_t vector;
 } ResetData;
 
 static void main_cpu_reset(void *opaque)
 {
     ResetData *s = (ResetData *)opaque;
-    CPUState *env = s->env;
+    CPUSH4State *env = s->env;
 
     cpu_state_reset(env);
     env->pc = s->vector;
@@ -224,7 +224,7 @@ static void r2d_init(ram_addr_t ram_size,
 	      const char *kernel_filename, const char *kernel_cmdline,
 	      const char *initrd_filename, const char *cpu_model)
 {
-    CPUState *env;
+    CPUSH4State *env;
     ResetData *reset_info;
     struct SH7750State *s;
     MemoryRegion *sdram = g_new(MemoryRegion, 1);