summary refs log tree commit diff stats
path: root/hw/integratorcp.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/integratorcp.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/integratorcp.c')
-rw-r--r--hw/integratorcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 46fd09d8a2..e9270125fc 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -502,7 +502,7 @@ static void integratorcp_init(ram_addr_t ram_size,
     integrator_binfo.kernel_filename = kernel_filename;
     integrator_binfo.kernel_cmdline = kernel_cmdline;
     integrator_binfo.initrd_filename = initrd_filename;
-    arm_load_kernel(&cpu->env, &integrator_binfo);
+    arm_load_kernel(cpu, &integrator_binfo);
 }
 
 static QEMUMachine integratorcp_machine = {