From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LOYdI-0002El-Le
	for qemu-devel@nongnu.org; Sun, 18 Jan 2009 09:28:12 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LOYdI-0002EZ-CF
	for qemu-devel@nongnu.org; Sun, 18 Jan 2009 09:28:12 -0500
Received: from [199.232.76.173] (port=60900 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LOYdI-0002EW-5n
	for qemu-devel@nongnu.org; Sun, 18 Jan 2009 09:28:12 -0500
Received: from savannah.gnu.org ([199.232.41.3]:60727 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LOYdH-0003BS-Sk
	for qemu-devel@nongnu.org; Sun, 18 Jan 2009 09:28:11 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LOYdH-0001Wo-8D
	for qemu-devel@nongnu.org; Sun, 18 Jan 2009 14:28:11 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LOYdH-0001Wk-0x
	for qemu-devel@nongnu.org; Sun, 18 Jan 2009 14:28:11 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LOYdH-0001Wk-0x@cvs.savannah.gnu.org>
Date: Sun, 18 Jan 2009 14:28:11 +0000
Subject: [Qemu-devel] [6366] serial: open a null device if the
	CharDriverState argument is null
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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;
 }