david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

axis_dev88: Use cpu_cris_init() to obtain CRISCPU

Browse Source 
Needed for cris_load_image().

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:50:35 +02:00
parent 9fca5636e1
commit ddeb9ae5fa
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/axis_dev88.c
View File

@ -247,6 +247,7 @@ void axisdev88_init (ram_addr_t ram_size,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
CRISCPU *cpu;
CPUCRISState *env; CPUCRISState *env;
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
@ -263,7 +264,8 @@ void axisdev88_init (ram_addr_t ram_size,
if (cpu_model == NULL) { if (cpu_model == NULL) {
cpu_model = "crisv32"; cpu_model = "crisv32";
} }
env = cpu_init(cpu_model); cpu = cpu_cris_init(cpu_model);
env = &cpu->env;
/* allocate RAM */ /* allocate RAM */
memory_region_init_ram(phys_ram, "axisdev88.ram", ram_size); memory_region_init_ram(phys_ram, "axisdev88.ram", ram_size);