ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exynos4210: Use cpu_arm_init() to store ARMCPU 

Needed for arm_pic_init_cpu().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com>
This commit is contained in:
Andreas Färber 2012-05-14 04:09:55 +02:00
parent 64c9e29708
commit ef6cbcc584
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/exynos4210.c
View File

@ -107,13 +107,13 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem,
SysBusDevice *busdev; SysBusDevice *busdev;
for (n = 0; n < EXYNOS4210_NCPUS; n++) { for (n = 0; n < EXYNOS4210_NCPUS; n++) {
s->env[n] = cpu_init("cortex-a9"); s->cpu[n] = cpu_arm_init("cortex-a9");
if (!s->env[n]) { if (!s->cpu[n]) {
fprintf(stderr, "Unable to find CPU %d definition\n", n); fprintf(stderr, "Unable to find CPU %d definition\n", n);
exit(1); exit(1);
} }
/* Create PIC controller for each processor instance */ /* Create PIC controller for each processor instance */
irqp = arm_pic_init_cpu(s->env[n]); irqp = arm_pic_init_cpu(&s->cpu[n]->env);
/* /*
* Get GICs gpio_in cpu_irq to connect a combiner to them later. * Get GICs gpio_in cpu_irq to connect a combiner to them later.

2
hw/exynos4210.h
View File

@ -83,7 +83,7 @@ typedef struct Exynos4210Irq {
} Exynos4210Irq; } Exynos4210Irq;
typedef struct Exynos4210State { typedef struct Exynos4210State {
CPUARMState * env[EXYNOS4210_NCPUS]; ARMCPU *cpu[EXYNOS4210_NCPUS];
Exynos4210Irq irqs; Exynos4210Irq irqs;
qemu_irq *irq_table; qemu_irq *irq_table;