aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2011-07-07 17:35:27 +0530
committerAmit Shah <amit.shah@redhat.com>2011-07-18 15:30:15 +0530
commit0219d73283b6399a737ef5a098f849b956618eaa (patch)
tree11f0cd8b53d9e3141a9a33d3d0f8e89059c557a0
parent95c9cde2dff9de9f4afa0450697bd70f56715be1 (diff)
virtio-console: Prevent abort()s in case of host chardev close
A host chardev could close just before the guest sends some data to be written. This will cause an -EPIPE error. This shouldn't be propagated to virtio-serial-bus. Ideally we should close the port once -EPIPE is received, but since the chardev interface doesn't return such meaningful values to its users, all we get is -1 for any kind of error. Just return 0 for now and wait for chardevs to return better error messages to act better on the return messages. Signed-off-by: Amit Shah <amit.shah@redhat.com>
-rw-r--r--hw/virtio-console.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index 713a761dfa..7ebfa26516 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -28,8 +28,22 @@ static ssize_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len)
ssize_t ret;
ret = qemu_chr_write(vcon->chr, buf, len);
-
trace_virtio_console_flush_buf(port->id, len, ret);
+
+ if (ret < 0) {
+ /*
+ * Ideally we'd get a better error code than just -1, but
+ * that's what the chardev interface gives us right now. If
+ * we had a finer-grained message, like -EPIPE, we could close
+ * this connection. Absent such error messages, the most we
+ * can do is to return 0 here.
+ *
+ * This will prevent stray -1 values to go to
+ * virtio-serial-bus.c and cause abort()s in
+ * do_flush_queued_data().
+ */
+ ret = 0;
+ }
return ret;
}