summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-05 11:50:35 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:42 +0200
commitddeb9ae5fa4270356d7cfdde279e7cbfbba8448d (patch)
treef6890486af8b025384207b56a1e475a75e96e396 /hw
parent9fca5636e1883346418d437320f43b0c34cb6cc1 (diff)
downloadqemu-ddeb9ae5fa4270356d7cfdde279e7cbfbba8448d.tar.gz
axis_dev88: Use cpu_cris_init() to obtain CRISCPU
Needed for cris_load_image(). 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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index 2304e3533a..636708c97b 100644
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -247,6 +247,7 @@ void axisdev88_init (ram_addr_t ram_size,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
+ CRISCPU *cpu;
CPUCRISState *env;
DeviceState *dev;
SysBusDevice *s;
@@ -263,7 +264,8 @@ void axisdev88_init (ram_addr_t ram_size,
if (cpu_model == NULL) {
cpu_model = "crisv32";
}
- env = cpu_init(cpu_model);
+ cpu = cpu_cris_init(cpu_model);
+ env = &cpu->env;
/* allocate RAM */
memory_region_init_ram(phys_ram, "axisdev88.ram", ram_size);