Move the registering of CPU reset handlers to before the point where
we leave the function in the -bios (not -kernel) case, so CPU reset
works correctly with -bios as well.
Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
hw/arm/boot.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index c8dc34f0865b..fc6a3ebf853d 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -488,6 +488,12 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info
*info)
int big_endian;
static const ARMInsnFixup *primary_loader;
+ for (; cs; cs = CPU_NEXT(cs)) {
+ cpu = ARM_CPU(cs);
+ cpu->env.boot_info = info;
+ qemu_register_reset(do_cpu_reset, cpu);
+ }
+
/* Load the kernel. */
if (!info->kernel_filename) {
@@ -651,10 +657,4 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info
*info)
}
}
info->is_linux = is_linux;
-
- for (; cs; cs = CPU_NEXT(cs)) {
- cpu = ARM_CPU(cs);
- cpu->env.boot_info = info;
- qemu_register_reset(do_cpu_reset, cpu);
- }
}
--
1.8.3.2
