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/collie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/collie.c') diff --git a/hw/collie.c b/hw/collie.c index e6f8dbfa52..56f89a9f2e 100644 --- a/hw/collie.c +++ b/hw/collie.c @@ -54,7 +54,7 @@ static void collie_init(ram_addr_t ram_size, collie_binfo.kernel_cmdline = kernel_cmdline; collie_binfo.initrd_filename = initrd_filename; collie_binfo.board_id = 0x208; - arm_load_kernel(&s->cpu->env, &collie_binfo); + arm_load_kernel(s->cpu, &collie_binfo); } static QEMUMachine collie_machine = { -- cgit v1.2.3-55-g7522