summaryrefslogtreecommitdiff
path: root/hw/escc.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
commita08d43677f87a19daa653774d3c6f71855e23178 (patch)
treeb37c74bd58d4dd7c21fbdea080a8b543e27a2ba9 /hw/escc.c
parenta62acdc0cc5308706e2503557a09828979b59a12 (diff)
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/escc.c')
-rw-r--r--hw/escc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/escc.c b/hw/escc.c
index 1911e7d10..66afbb9da 100644
--- a/hw/escc.c
+++ b/hw/escc.c
@@ -758,7 +758,7 @@ int escc_init(target_phys_addr_t base, qemu_irq irqA, qemu_irq irqB,
register_savevm("escc", base, 2, escc_save, escc_load, s);
else
register_savevm("escc", -1, 2, escc_save, escc_load, s);
- qemu_register_reset(escc_reset, 0, s);
+ qemu_register_reset(escc_reset, s);
escc_reset(s);
return escc_io_memory;
}
@@ -932,6 +932,6 @@ void slavio_serial_ms_kbd_init(target_phys_addr_t base, qemu_irq irq,
"QEMU Sun Mouse");
qemu_add_kbd_event_handler(sunkbd_event, &s->chn[1]);
register_savevm("slavio_serial_mouse", base, 2, escc_save, escc_load, s);
- qemu_register_reset(escc_reset, 0, s);
+ qemu_register_reset(escc_reset, s);
escc_reset(s);
}