[Qemu-devel] [6366] serial: open a null device if the CharDriverState argument is null

[Qemu-devel] [6366] serial: open a null device if the CharDriverState argument is null

[Aurelien Jarno]

Revision: 6366
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6366
Author:   aurel32
Date:     2009-01-18 14:28:10 +0000 (Sun, 18 Jan 2009)

Log Message:
-----------
serial: open a null device if the CharDriverState argument is null

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/hw/serial.c

Modified: trunk/hw/serial.c
===================================================================
--- trunk/hw/serial.c	2009-01-18 14:08:04 UTC (rev 6365)
+++ trunk/hw/serial.c	2009-01-18 14:28:10 UTC (rev 6366)
@@ -711,7 +711,7 @@
 {
     s->irq = irq;
     s->baudbase = baudbase;
-    s->chr = chr;
+    s->chr = chr ?: qemu_chr_open("null", "null", NULL);
 
     s->modem_status_poll = qemu_new_timer(vm_clock, (QEMUTimerCB *) serial_update_msl, s);
 
@@ -721,6 +721,8 @@
     qemu_register_reset(serial_reset, s);
     serial_reset(s);
 
+    qemu_chr_add_handlers(s->chr, serial_can_receive1, serial_receive1,
+                          serial_event, s);
 }
 
 /* If fd is zero, it means that the serial device uses the console */
@@ -739,8 +741,6 @@
 
     register_ioport_write(base, 8, 1, serial_ioport_write, s);
     register_ioport_read(base, 8, 1, serial_ioport_read, s);
-    qemu_chr_add_handlers(chr, serial_can_receive1, serial_receive1,
-                          serial_event, s);
     return s;
 }
 
@@ -837,8 +837,6 @@
                                              serial_mm_write, s);
         cpu_register_physical_memory(base, 8 << it_shift, s_io_memory);
     }
-    qemu_chr_add_handlers(chr, serial_can_receive1, serial_receive1,
-                          serial_event, s);
     serial_update_msl(s);
     return s;
 }