Patchwork virtio-console: Also throttle when less was written then requested

login
register
mail settings
Submitter Hans de Goede
Date April 2, 2013, 5:35 p.m.
Message ID <1364924133-10519-2-git-send-email-hdegoede@redhat.com>
Download mbox | patch
Permalink /patch/233102/
State New
Headers show

Comments

Hans de Goede - April 2, 2013, 5:35 p.m.
This is necessary so that we get properly woken up to write the rest.

This patch also changes the len argument to the have_data callback, to
avoid doing an unsigned signed comparison.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
---
 hw/virtio-console.c | 8 +++++---
 hw/virtio-serial.h  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

Patch

diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index 3ad6774..908ec17 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -36,7 +36,8 @@  static gboolean chr_write_unblocked(GIOChannel *chan, GIOCondition cond,
 }
 
 /* Callback function that's called when the guest sends us data */
-static ssize_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len)
+static ssize_t flush_buf(VirtIOSerialPort *port,
+                         const uint8_t *buf, ssize_t len)
 {
     VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
     ssize_t ret;
@@ -49,7 +50,7 @@  static ssize_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len)
     ret = qemu_chr_fe_write(vcon->chr, buf, len);
     trace_virtio_console_flush_buf(port->id, len, ret);
 
-    if (ret <= 0) {
+    if (ret < len) {
         VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_GET_CLASS(port);
 
         /*
@@ -58,7 +59,8 @@  static ssize_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len)
          * we had a finer-grained message, like -EPIPE, we could close
          * this connection.
          */
-        ret = 0;
+        if (ret < 0)
+            ret = 0;
         if (!k->is_console) {
             virtio_serial_throttle_port(port, true);
             if (!vcon->watch) {
diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h
index 516400f..4dc0c0a 100644
--- a/hw/virtio-serial.h
+++ b/hw/virtio-serial.h
@@ -104,7 +104,7 @@  typedef struct VirtIOSerialPortClass {
      * 'len'.  In this case, throttling will be enabled for this port.
      */
     ssize_t (*have_data)(VirtIOSerialPort *port, const uint8_t *buf,
-                         size_t len);
+                         ssize_t len);
 } VirtIOSerialPortClass;
 
 /*