aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-05 11:58:29 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:42 +0200
commit1584aafd02b949d6fa554e93bd70e5940217b66c (patch)
tree35c71fbbaa7e6341374f5778cfdb096c4c84c19d /hw
parent5935664fc06f1b6c0276c11e736608ac7ccebe5f (diff)
downloadqemu-1584aafd02b949d6fa554e93bd70e5940217b66c.zip
qemu-1584aafd02b949d6fa554e93bd70e5940217b66c.tar.gz
qemu-1584aafd02b949d6fa554e93bd70e5940217b66c.tar.bz2
cris-boot: Pass CRISCPU to main_cpu_reset().
Allows us to use cpu_reset() in place of cpu_state_reset(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/cris-boot.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/cris-boot.c b/hw/cris-boot.c
index 331b2d1..b21326f 100644
--- a/hw/cris-boot.c
+++ b/hw/cris-boot.c
@@ -29,12 +29,13 @@
static void main_cpu_reset(void *opaque)
{
- CPUCRISState *env = opaque;
+ CRISCPU *cpu = opaque;
+ CPUCRISState *env = &cpu->env;
struct cris_load_info *li;
li = env->load_info;
- cpu_state_reset(env);
+ cpu_reset(CPU(cpu));
if (!li) {
/* nothing more to do. */
@@ -93,5 +94,5 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li)
}
pstrcpy_targphys("cmdline", 0x40000000, 256, li->cmdline);
}
- qemu_register_reset(main_cpu_reset, env);
+ qemu_register_reset(main_cpu_reset, cpu);
}