mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cris-boot: Pass CRISCPU to main_cpu_reset().

Browse Source 
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>
This commit is contained in:
Andreas Färber 2012-05-05 11:58:29 +02:00
parent 5935664fc0
commit 1584aafd02
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/cris-boot.c
View File

@ -29,12 +29,13 @@
static void main_cpu_reset(void *opaque) static void main_cpu_reset(void *opaque)
{ {
CPUCRISState *env = opaque; CRISCPU *cpu = opaque;
CPUCRISState *env = &cpu->env;
struct cris_load_info *li; struct cris_load_info *li;
li = env->load_info; li = env->load_info;
cpu_state_reset(env); cpu_reset(CPU(cpu));
if (!li) { if (!li) {
/* nothing more to do. */ /* 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); pstrcpy_targphys("cmdline", 0x40000000, 256, li->cmdline);
} }
qemu_register_reset(main_cpu_reset, env); qemu_register_reset(main_cpu_reset, cpu);
} }