summaryrefslogtreecommitdiffstats
path: root/hw/serial.c
diff options
context:
space:
mode:
authorJan Kiszka2009-06-27 09:25:07 +0200
committerAnthony Liguori2009-06-29 21:18:08 +0200
commita08d43677f87a19daa653774d3c6f71855e23178 (patch)
treeb37c74bd58d4dd7c21fbdea080a8b543e27a2ba9 /hw/serial.c
parentmonitor: Make pci_add device options truely optional (diff)
downloadqemu-a08d43677f87a19daa653774d3c6f71855e23178.tar.gz
qemu-a08d43677f87a19daa653774d3c6f71855e23178.tar.xz
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/serial.c')
-rw-r--r--hw/serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/serial.c b/hw/serial.c
index b255ea90e2..d70504bb06 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -720,7 +720,7 @@ static void serial_init_core(SerialState *s, qemu_irq irq, int baudbase,
s->fifo_timeout_timer = qemu_new_timer(vm_clock, (QEMUTimerCB *) fifo_timeout_int, s);
s->transmit_timer = qemu_new_timer(vm_clock, (QEMUTimerCB *) serial_xmit, s);
- qemu_register_reset(serial_reset, 0, s);
+ qemu_register_reset(serial_reset, s);
serial_reset(s);
qemu_chr_add_handlers(s->chr, serial_can_receive1, serial_receive1,