summaryrefslogtreecommitdiffstats
path: root/hw/cris-boot.c
diff options
context:
space:
mode:
authorAndreas Färber2012-05-05 11:57:07 +0200
committerAndreas Färber2012-06-04 23:00:42 +0200
commit5935664fc06f1b6c0276c11e736608ac7ccebe5f (patch)
tree5709354e46b59712d44abb56be8985991b13a570 /hw/cris-boot.c
parentaxis_dev88: Use cpu_cris_init() to obtain CRISCPU (diff)
downloadqemu-5935664fc06f1b6c0276c11e736608ac7ccebe5f.tar.gz
qemu-5935664fc06f1b6c0276c11e736608ac7ccebe5f.tar.xz
qemu-5935664fc06f1b6c0276c11e736608ac7ccebe5f.zip
cris-boot: Pass CRISCPU to cris_load_image()
Needed for main_cpu_reset(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Diffstat (limited to 'hw/cris-boot.c')
-rw-r--r--hw/cris-boot.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/cris-boot.c b/hw/cris-boot.c
index ca6c52fa8e..331b2d1d89 100644
--- a/hw/cris-boot.c
+++ b/hw/cris-boot.c
@@ -60,8 +60,9 @@ static uint64_t translate_kernel_address(void *opaque, uint64_t addr)
return addr - 0x80000000LL;
}
-void cris_load_image(CPUCRISState *env, struct cris_load_info *li)
+void cris_load_image(CRISCPU *cpu, struct cris_load_info *li)
{
+ CPUCRISState *env = &cpu->env;
uint64_t entry, high;
int kcmdline_len;
int image_size;