summaryrefslogtreecommitdiff
path: root/hw/arm_boot.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@web.de>2009-06-27 09:25:07 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-06-29 14:18:08 -0500
commit31ca80991f0665168e4dfc19d98bb0d23f6713ad (patch)
treeb37c74bd58d4dd7c21fbdea080a8b543e27a2ba9 /hw/arm_boot.c
parenteb4c3ae3ad8ed1dc9fdb43543405383832706fee (diff)
downloadqemu-31ca80991f0665168e4dfc19d98bb0d23f6713ad.tar.gz
qemu-31ca80991f0665168e4dfc19d98bb0d23f6713ad.tar.bz2
qemu-31ca80991f0665168e4dfc19d98bb0d23f6713ad.zip
Revert "Introduce reset notifier order"
This reverts commit 8217606e6edb49591b4a6fd5a0d1229cebe470a9 (and updates later added users of qemu_register_reset), we solved the problem it originally addressed less invasively. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/arm_boot.c')
-rw-r--r--hw/arm_boot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index acfa67e966..35f0130db1 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -203,7 +203,7 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info)
if (info->nb_cpus == 0)
info->nb_cpus = 1;
env->boot_info = info;
- qemu_register_reset(main_cpu_reset, 0, env);
+ qemu_register_reset(main_cpu_reset, env);
}
/* Assume that raw images are linux kernels, and ELF images are not. */