[Qemu-commits] [COMMIT 387f4a5] hw/serial: don't create a char device if none isspecified

[Anthony Liguori]

From: Aurelien Jarno <address@hidden>

When creating null devices, there is no way to ensure the unicity of
the labels. Bail out with an error message instead.

Signed-off-by: Aurelien Jarno <address@hidden>

diff --git a/hw/serial.c b/hw/serial.c
index 6f7b30e..1f4ce77 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -712,9 +712,14 @@ static void serial_reset(void *opaque)
 static void serial_init_core(SerialState *s, qemu_irq irq, int baudbase,
                             CharDriverState *chr)
 {
+    if (!chr) {
+        fprintf(stderr, "Can't create serial device, empty char device\n");
+       exit(1);
+    }
+
     s->irq = irq;
     s->baudbase = baudbase;
-    s->chr = chr ?: qemu_chr_open("null", "null", NULL);
+    s->chr = chr;
 
     s->modem_status_poll = qemu_new_timer(vm_clock, (QEMUTimerCB *) 
serial_update_msl, s);