david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm_boot: Pass ARMCPU to do_cpu_reset()

Browse Source 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Andreas Färber 2012-05-05 12:40:39 +02:00
parent 31363f12f5
commit 351d566621
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/arm_boot.c
View File

@ -274,10 +274,11 @@ static int load_dtb(target_phys_addr_t addr, const struct arm_boot_info *binfo)
static void do_cpu_reset(void *opaque) static void do_cpu_reset(void *opaque)
{ {
CPUARMState *env = opaque; ARMCPU *cpu = opaque;
CPUARMState *env = &cpu->env;
const struct arm_boot_info *info = env->boot_info; const struct arm_boot_info *info = env->boot_info;
cpu_state_reset(env); cpu_reset(CPU(cpu));
if (info) { if (info) {
if (!info->is_linux) { if (!info->is_linux) {
/* Jump to the entry point. */ /* Jump to the entry point. */
@ -302,6 +303,7 @@ static void do_cpu_reset(void *opaque)
void arm_load_kernel(CPUARMState *env, struct arm_boot_info *info) void arm_load_kernel(CPUARMState *env, struct arm_boot_info *info)
{ {
ARMCPU *cpu;
int kernel_size; int kernel_size;
int initrd_size; int initrd_size;
int n; int n;
@ -406,7 +408,8 @@ void arm_load_kernel(CPUARMState *env, struct arm_boot_info *info)
info->is_linux = is_linux; info->is_linux = is_linux;
for (; env; env = env->next_cpu) { for (; env; env = env->next_cpu) {
cpu = arm_env_get_cpu(env);
env->boot_info = info; env->boot_info = info;
qemu_register_reset(do_cpu_reset, env); qemu_register_reset(do_cpu_reset, cpu);
} }
} }