aboutsummaryrefslogtreecommitdiff
path: root/hw/arm_boot.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-14 01:05:40 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-11 00:23:04 +0200
commit5d309320e3e419187b48b4537d403daf95835bc6 (patch)
treeb0b854173fdf1897e6030328bbf1bfddbe10ab2c /hw/arm_boot.c
parent9543b0cdd64ac0ba109b92eaf00e458b6223a6a8 (diff)
downloadqemu-5d309320e3e419187b48b4537d403daf95835bc6.zip
qemu-5d309320e3e419187b48b4537d403daf95835bc6.tar.gz
qemu-5d309320e3e419187b48b4537d403daf95835bc6.tar.bz2
arm_boot: Pass ARMCPU to arm_boot_info::secondary_cpu_reset_hook()
Adapt highbank accordingly. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm_boot.c')
-rw-r--r--hw/arm_boot.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index 4955f01..8eabfb2 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -72,9 +72,11 @@ static void default_write_secondary(ARMCPU *cpu,
info->smp_loader_start);
}
-static void default_reset_secondary(CPUARMState *env,
+static void default_reset_secondary(ARMCPU *cpu,
const struct arm_boot_info *info)
{
+ CPUARMState *env = &cpu->env;
+
stl_phys_notdirty(info->smp_bootreg_addr, 0);
env->regs[15] = info->smp_loader_start;
}
@@ -295,7 +297,7 @@ static void do_cpu_reset(void *opaque)
}
}
} else {
- info->secondary_cpu_reset_hook(env, info);
+ info->secondary_cpu_reset_hook(cpu, info);
}
}
}