From 3aaa8dfae955d7bec462cc4e2fce185ef6d41b5a Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Mon, 14 May 2012 02:39:57 +0200 Subject: 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 Acked-by: Igor Mitsyanko (for exynos) Acked-by: Peter Maydell --- hw/integratorcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/integratorcp.c') 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 = { -- cgit v1.2.3-55-g7522