diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-05 11:58:29 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:42 +0200 |
| commit | 1584aafd02b949d6fa554e93bd70e5940217b66c (patch) | |
| tree | 35c71fbbaa7e6341374f5778cfdb096c4c84c19d | |
| parent | 5935664fc06f1b6c0276c11e736608ac7ccebe5f (diff) | |
| download | focaccia-qemu-1584aafd02b949d6fa554e93bd70e5940217b66c.tar.gz focaccia-qemu-1584aafd02b949d6fa554e93bd70e5940217b66c.zip | |
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>
| -rw-r--r-- | hw/cris-boot.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/cris-boot.c b/hw/cris-boot.c index 331b2d1d89..b21326fade 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); } |