diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-05 11:57:07 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:42 +0200 |
| commit | 5935664fc06f1b6c0276c11e736608ac7ccebe5f (patch) | |
| tree | 5709354e46b59712d44abb56be8985991b13a570 /hw | |
| parent | ddeb9ae5fa4270356d7cfdde279e7cbfbba8448d (diff) | |
| download | qemu-5935664fc06f1b6c0276c11e736608ac7ccebe5f.zip qemu-5935664fc06f1b6c0276c11e736608ac7ccebe5f.tar.gz qemu-5935664fc06f1b6c0276c11e736608ac7ccebe5f.tar.bz2 | |
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')
| -rw-r--r-- | hw/axis_dev88.c | 2 | ||||
| -rw-r--r-- | hw/cris-boot.c | 3 | ||||
| -rw-r--r-- | hw/cris-boot.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c index 636708c..eab6327 100644 --- a/hw/axis_dev88.c +++ b/hw/axis_dev88.c @@ -346,7 +346,7 @@ void axisdev88_init (ram_addr_t ram_size, li.image_filename = kernel_filename; li.cmdline = kernel_cmdline; - cris_load_image(env, &li); + cris_load_image(cpu, &li); } static QEMUMachine axisdev88_machine = { diff --git a/hw/cris-boot.c b/hw/cris-boot.c index ca6c52f..331b2d1 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; diff --git a/hw/cris-boot.h b/hw/cris-boot.h index ecb9779..0a2c242 100644 --- a/hw/cris-boot.h +++ b/hw/cris-boot.h @@ -8,4 +8,4 @@ struct cris_load_info target_phys_addr_t entry; }; -void cris_load_image(CPUCRISState *env, struct cris_load_info *li); +void cris_load_image(CRISCPU *cpu, struct cris_load_info *li); |