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/xilinx_zynq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/xilinx_zynq.c') diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c index 68349e2722..11026cb554 100644 --- a/hw/xilinx_zynq.c +++ b/hw/xilinx_zynq.c @@ -137,7 +137,7 @@ static void zynq_init(ram_addr_t ram_size, const char *boot_device, zynq_binfo.nb_cpus = 1; zynq_binfo.board_id = 0xd32; zynq_binfo.loader_start = 0; - arm_load_kernel(first_cpu, &zynq_binfo); + arm_load_kernel(arm_env_get_cpu(first_cpu), &zynq_binfo); } static QEMUMachine zynq_machine = { -- cgit v1.2.3-55-g7522