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() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/arm_boot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/arm_boot.c') diff --git a/hw/arm_boot.c b/hw/arm_boot.c index 8eabfb204f..d0e643ba11 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -303,9 +303,9 @@ static void do_cpu_reset(void *opaque) } } -void arm_load_kernel(CPUARMState *env, struct arm_boot_info *info) +void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) { - ARMCPU *cpu = arm_env_get_cpu(env); + CPUARMState *env = &cpu->env; int kernel_size; int initrd_size; int n; -- cgit 1.4.1