Rearrange char event handlers to fix CHR_EVENT_RESET.

[qemu.git] / hw / serial.c

diff --git a/hw/serial.c b/hw/serial.c
index 16dbc65c378739bdb5a5b972b0bdee1ffbc85e0f..a88aec17d15d6352cb536434a489e0f1930a9152 100644 (file)
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -365,8 +365,8 @@ SerialState *serial_init(SetIRQFunc *set_irq, void *opaque,
     register_ioport_write(base, 8, 1, serial_ioport_write, s);
     register_ioport_read(base, 8, 1, serial_ioport_read, s);
     s->chr = chr;
-    qemu_chr_add_read_handler(chr, serial_can_receive1, serial_receive1, s);
-    qemu_chr_add_event_handler(chr, serial_event);
+    qemu_chr_add_handlers(chr, serial_can_receive1, serial_receive1,
+                          serial_event, s);
     return s;
 }
 
@@ -453,7 +453,7 @@ SerialState *serial_mm_init (SetIRQFunc *set_irq, void *opaque,
                                          serial_mm_write, s);
     cpu_register_physical_memory(base, 8 << it_shift, s_io_memory);
     s->chr = chr;
-    qemu_chr_add_read_handler(chr, serial_can_receive1, serial_receive1, s);
-    qemu_chr_add_event_handler(chr, serial_event);
+    qemu_chr_add_handlers(chr, serial_can_receive1, serial_receive1,
+                          serial_event, s);
     return s;
 }