diff mbox

[8/8] usb-redir: Add flow control support

Message ID 1363279017-3894-9-git-send-email-hdegoede@redhat.com
State New
Headers show

Commit Message

Hans de Goede March 14, 2013, 4:36 p.m. UTC 
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 hw/usb/redirect.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

Comments

Gerd Hoffmann March 19, 2013, 12:40 p.m. UTC | #1 
On 03/14/13 17:36, Hans de Goede wrote:
> +        if (!dev->watch) {
> +            dev->watch = qemu_chr_fe_add_watch(dev->cs, G_IO_OUT,
> +                                               usbredir_write_unblocked, dev);
> +        }
> +        if (r < 0)
> +            r = 0;
> +    }
> +    return r;

=== checkpatch complains ===
WARNING: braces {} are necessary for all arms of this statement
#48: FILE: hw/usb/redirect.c:290:
+        if (r < 0)
[...]

total: 0 errors, 1 warnings, 65 lines checked

cheers,
  Gerd
Hans de Goede March 19, 2013, 1:54 p.m. UTC | #2 
Hi,

Oops. v2 is on its way.

Regards,

Hans


On 03/19/2013 01:40 PM, Gerd Hoffmann wrote:
> On 03/14/13 17:36, Hans de Goede wrote:
>> +        if (!dev->watch) {
>> +            dev->watch = qemu_chr_fe_add_watch(dev->cs, G_IO_OUT,
>> +                                               usbredir_write_unblocked, dev);
>> +        }
>> +        if (r < 0)
>> +            r = 0;
>> +    }
>> +    return r;
>
> === checkpatch complains ===
> WARNING: braces {} are necessary for all arms of this statement
> #48: FILE: hw/usb/redirect.c:290:
> +        if (r < 0)
> [...]
>
> total: 0 errors, 1 warnings, 65 lines checked
>
> cheers,
>    Gerd
>
diff mbox

Patch

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index c519b9b..9ba714d 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -104,6 +104,8 @@  struct USBRedirDevice {
     /* Data passed from chardev the fd_read cb to the usbredirparser read cb */
     const uint8_t *read_buf;
     int read_buf_size;
+    /* Active chardev-watch-tag */
+    guint watch;
     /* For async handling of close */
     QEMUBH *chardev_close_bh;
     /* To delay the usb attach in case of quick chardev close + open */
@@ -254,9 +256,21 @@  static int usbredir_read(void *priv, uint8_t *data, int count)
     return count;
 }
 
+static gboolean usbredir_write_unblocked(GIOChannel *chan, GIOCondition cond,
+                                         void *opaque)
+{
+    USBRedirDevice *dev = opaque;
+
+    dev->watch = 0;
+    usbredirparser_do_write(dev->parser);
+
+    return FALSE;
+}
+
 static int usbredir_write(void *priv, uint8_t *data, int count)
 {
     USBRedirDevice *dev = priv;
+    int r;
 
     if (!dev->cs->opened) {
         return 0;
@@ -267,7 +281,16 @@  static int usbredir_write(void *priv, uint8_t *data, int count)
         return 0;
     }
 
-    return qemu_chr_fe_write(dev->cs, data, count);
+    r = qemu_chr_fe_write(dev->cs, data, count);
+    if (r < count) {
+        if (!dev->watch) {
+            dev->watch = qemu_chr_fe_add_watch(dev->cs, G_IO_OUT,
+                                               usbredir_write_unblocked, dev);
+        }
+        if (r < 0)
+            r = 0;
+    }
+    return r;
 }
 
 /*
@@ -1085,6 +1108,10 @@  static void usbredir_chardev_close_bh(void *opaque)
         usbredirparser_destroy(dev->parser);
         dev->parser = NULL;
     }
+    if (dev->watch) {
+        g_source_remove(dev->watch);
+        dev->watch = 0;
+    }
 }
 
 static void usbredir_create_parser(USBRedirDevice *dev)
@@ -1319,6 +1346,9 @@  static void usbredir_handle_destroy(USBDevice *udev)
     if (dev->parser) {
         usbredirparser_destroy(dev->parser);
     }
+    if (dev->watch) {
+        g_source_remove(dev->watch);
+    }
 
     free(dev->filter_rules);
 }