[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/10] usb-redir: Add flow control support
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 02/10] usb-redir: Add flow control support |
Date: |
Wed, 3 Apr 2013 11:43:32 +0200 |
From: Hans de Goede <address@hidden>
Signed-off-by: Hans de Goede <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/redirect.c | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index cf66df1..0ddb081 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->be_open) {
return 0;
@@ -267,7 +281,17 @@ 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 +1109,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)
@@ -1317,6 +1345,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);
}
--
1.7.9.7
- [Qemu-devel] [PULL 00/10] usb patch queue, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 04/10] xhci: remove leftover debug printf, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 06/10] xhci: zap unused name field, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 01/10] usb-redir: Fix crash on migration with no client connected, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 07/10] usb-hub: limit chain length, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 02/10] usb-redir: Add flow control support,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 08/10] usb-hub: report status changes only once, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 09/10] usb: update docs for bus name change, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 03/10] xhci: fix numintrs sanity checks, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 05/10] xhci: remove unimplemented printfs, Gerd Hoffmann, 2013/04/03
- [Qemu-devel] [PATCH 10/10] usb-tablet: Don't claim wakeup capability for USB-2 version, Gerd Hoffmann, 2013/04/03