summary refs log tree commit diff stats
path: root/hw/vexpress.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-14 02:39:57 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-11 00:23:04 +0200
commit3aaa8dfae955d7bec462cc4e2fce185ef6d41b5a (patch)
tree0cdd65f87cc18ed8d8f1a7476a6348b848588dc2 /hw/vexpress.c
parent17c2f0bf37182d46d66998bf037b2cac520d2183 (diff)
downloadfocaccia-qemu-3aaa8dfae955d7bec462cc4e2fce185ef6d41b5a.tar.gz
focaccia-qemu-3aaa8dfae955d7bec462cc4e2fce185ef6d41b5a.zip
arm_boot: Pass ARMCPU to arm_load_kernel()
In particular this simplifies the &s->mpu->cpu->env expression again.

first_cpu and ->next_cpu are expected to be QOM'ified later.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com> (for exynos)
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/vexpress.c')
-rw-r--r--hw/vexpress.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/vexpress.c b/hw/vexpress.c
index e957f4390e..4797c6ab38 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -438,7 +438,7 @@ static void vexpress_common_init(const VEDBoardInfo *daughterboard,
     vexpress_binfo.smp_loader_start = map[VE_SRAM];
     vexpress_binfo.smp_bootreg_addr = map[VE_SYSREGS] + 0x30;
     vexpress_binfo.gic_cpu_if_addr = daughterboard->gic_cpu_if_addr;
-    arm_load_kernel(first_cpu, &vexpress_binfo);
+    arm_load_kernel(arm_env_get_cpu(first_cpu), &vexpress_binfo);
 }
 
 static void vexpress_a9_init(ram_addr_t ram_size,