[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/27] exynos4210: Use cpu_arm_init() to store ARMCP
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 16/27] exynos4210: Use cpu_arm_init() to store ARMCPU |
Date: |
Mon, 11 Jun 2012 02:00:48 +0200 |
Needed for arm_pic_init_cpu().
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Acked-by: Igor Mitsyanko <address@hidden>
---
hw/exynos4210.c | 6 +++---
hw/exynos4210.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/exynos4210.c b/hw/exynos4210.c
index ae53837..7dc3787 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 b520676..b1b4609 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;
--
1.7.7
- [Qemu-devel] [PULL] QOM CPUState, part 3a: cleanups & preparations, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 01/27] nseries: Rename n800_s::cpu to mpu, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 02/27] omap_sx1: Rename omap_mpu_state_s variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 04/27] mainstone: Rename PXA2xxState variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 05/27] spitz: Rename PXA2xxState variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 06/27] tosa: Rename PXA2xxState variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 03/27] palm: Rename omap_mpu_state_s variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 07/27] z2: Rename PXA2xxState variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 21/27] arm_boot: Pass ARMCPU to arm_load_kernel(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 16/27] exynos4210: Use cpu_arm_init() to store ARMCPU,
Andreas Färber <=
- [Qemu-devel] [PATCH 12/27] arm_boot: Pass ARMCPU to arm_boot_info::write_secondary_boot(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 18/27] pxa2xx_pic: Store ARMCPU in PXA2xxPICState, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 19/27] pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 20/27] xilinx_zynq: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 17/27] pxa2xx: Pass ARMCPU to pxa2xx_pic_init(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 13/27] arm_boot: Pass ARMCPU to arm_boot_info::secondary_cpu_reset_hook(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 23/27] xen_machine_pv: Use cpu_x86_init() to obtain X86CPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 25/27] s390-virtio: Use cpu_s390x_init() to obtain S390CPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 22/27] arm_pic: Pass ARMCPU to arm_pic_init_cpu(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 24/27] target-s390x: Let cpu_s390x_init() return S390CPU, Andreas Färber, 2012/06/10