diff options
| author | Jan Kiszka <jan.kiszka@web.de> | 2009-06-27 09:25:07 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-06-29 14:18:08 -0500 |
| commit | a08d43677f87a19daa653774d3c6f71855e23178 (patch) | |
| tree | b37c74bd58d4dd7c21fbdea080a8b543e27a2ba9 /hw/sun4m.c | |
| parent | a62acdc0cc5308706e2503557a09828979b59a12 (diff) | |
| download | qemu-a08d43677f87a19daa653774d3c6f71855e23178.tar.gz qemu-a08d43677f87a19daa653774d3c6f71855e23178.tar.bz2 qemu-a08d43677f87a19daa653774d3c6f71855e23178.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/sun4m.c')
| -rw-r--r-- | hw/sun4m.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/sun4m.c b/hw/sun4m.c index ef9fa5e0b6..c67bf0b1b2 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -418,9 +418,9 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, cpu_sparc_set_id(env, i); envs[i] = env; if (i == 0) { - qemu_register_reset(main_cpu_reset, 0, env); + qemu_register_reset(main_cpu_reset, env); } else { - qemu_register_reset(secondary_cpu_reset, 0, env); + qemu_register_reset(secondary_cpu_reset, env); env->halted = 1; } cpu_irqs[i] = qemu_allocate_irqs(cpu_set_irq, envs[i], MAX_PILS); @@ -1208,9 +1208,9 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size, cpu_sparc_set_id(env, i); envs[i] = env; if (i == 0) { - qemu_register_reset(main_cpu_reset, 0, env); + qemu_register_reset(main_cpu_reset, env); } else { - qemu_register_reset(secondary_cpu_reset, 0, env); + qemu_register_reset(secondary_cpu_reset, env); env->halted = 1; } cpu_irqs[i] = qemu_allocate_irqs(cpu_set_irq, envs[i], MAX_PILS); @@ -1430,7 +1430,7 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size, cpu_sparc_set_id(env, 0); - qemu_register_reset(main_cpu_reset, 0, env); + qemu_register_reset(main_cpu_reset, env); cpu_irqs = qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS); env->prom_addr = hwdef->slavio_base; |