summary refs log tree commit diff stats
path: root/hw/virtio-console.c
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2011-12-21 12:28:27 +0530
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-21 15:00:29 -0600
commit6640422c172e01d0e191a754d3643a68abca83bc (patch)
tree198effaabe30c44cea7a2f94e29531c57e73042e /hw/virtio-console.c
parent3799ce4ab64f578eb818689a276e4f0c73d01fb5 (diff)
downloadfocaccia-qemu-6640422c172e01d0e191a754d3643a68abca83bc.tar.gz
focaccia-qemu-6640422c172e01d0e191a754d3643a68abca83bc.zip
virtio-console: Check if chardev backends available before calling into them
For the callback functions invoked by the virtio-serial-bus code, check
if we have chardev backends registered before we call into the chardev
functions.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Reported-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/virtio-console.c')
-rw-r--r--hw/virtio-console.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index d3351c83ff..dbbea76dfb 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -27,6 +27,11 @@ static ssize_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len)
     VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
     ssize_t ret;
 
+    if (!vcon->chr) {
+        /* If there's no backend, we can just say we consumed all data. */
+        return len;
+    }
+
     ret = qemu_chr_fe_write(vcon->chr, buf, len);
     trace_virtio_console_flush_buf(port->id, len, ret);
 
@@ -52,6 +57,9 @@ static void guest_open(VirtIOSerialPort *port)
 {
     VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
 
+    if (!vcon->chr) {
+        return;
+    }
     qemu_chr_fe_open(vcon->chr);
 }
 
@@ -60,6 +68,9 @@ static void guest_close(VirtIOSerialPort *port)
 {
     VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
 
+    if (!vcon->chr) {
+        return;
+    }
     qemu_chr_fe_close(vcon->chr);
 }