diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-14 04:09:55 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-11 00:23:04 +0200 |
| commit | ef6cbcc584c6b044016677147da0a7c3632d0e6f (patch) | |
| tree | cd55c595468bf8dbc1bd592a22963a0073212a38 | |
| parent | 64c9e29708b36caefa6b9e8e7ae48fbc93989400 (diff) | |
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>
| -rw-r--r-- | hw/exynos4210.c | 6 | ||||
| -rw-r--r-- | hw/exynos4210.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/hw/exynos4210.c b/hw/exynos4210.c index ae53837644..7dc37871f3 100644 --- a/hw/exynos4210.c +++ b/hw/exynos4210.c @@ -107,13 +107,13 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, SysBusDevice *busdev; for (n = 0; n < EXYNOS4210_NCPUS; n++) { - s->env[n] = cpu_init("cortex-a9"); - if (!s->env[n]) { + s->cpu[n] = cpu_arm_init("cortex-a9"); + if (!s->cpu[n]) { fprintf(stderr, "Unable to find CPU %d definition\n", n); exit(1); } /* 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. diff --git a/hw/exynos4210.h b/hw/exynos4210.h index b520676c62..b1b4609054 100644 --- a/hw/exynos4210.h +++ b/hw/exynos4210.h @@ -83,7 +83,7 @@ typedef struct Exynos4210Irq { } Exynos4210Irq; typedef struct Exynos4210State { - CPUARMState * env[EXYNOS4210_NCPUS]; + ARMCPU *cpu[EXYNOS4210_NCPUS]; Exynos4210Irq irqs; qemu_irq *irq_table; |