|
 |
5e10b14 |
From 2b797647b4a85a765bfdd8f4539d1fa10daad4fa Mon Sep 17 00:00:00 2001
|
|
 |
3f1f296 |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
3f1f296 |
Date: Tue, 19 Jul 2011 10:56:19 +0200
|
|
|
5e10b14 |
Subject: [PATCH 11/13] usb-redir: Add flow control support
|
|
|
3f1f296 |
|
|
|
3f1f296 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
3f1f296 |
---
|
|
|
3f1f296 |
usb-redir.c | 28 +++++++++++++++++++++++++++-
|
|
|
3f1f296 |
1 files changed, 27 insertions(+), 1 deletions(-)
|
|
|
3f1f296 |
|
|
|
3f1f296 |
diff --git a/usb-redir.c b/usb-redir.c
|
|
|
3f1f296 |
index e2b5a2c..6932beb 100644
|
|
|
3f1f296 |
--- a/usb-redir.c
|
|
|
3f1f296 |
+++ b/usb-redir.c
|
|
|
3f1f296 |
@@ -224,8 +224,22 @@ static int usbredir_read(void *priv, uint8_t *data, int count)
|
|
|
3f1f296 |
static int usbredir_write(void *priv, uint8_t *data, int count)
|
|
|
3f1f296 |
{
|
|
|
3f1f296 |
USBRedirDevice *dev = priv;
|
|
|
3f1f296 |
+ int r;
|
|
|
3f1f296 |
|
|
|
3f1f296 |
- return qemu_chr_write(dev->cs, data, count);
|
|
|
3f1f296 |
+ if (dev->cs->write_blocked) {
|
|
|
3f1f296 |
+ return 0;
|
|
|
3f1f296 |
+ }
|
|
|
3f1f296 |
+
|
|
|
3f1f296 |
+ r = qemu_chr_write(dev->cs, data, count);
|
|
|
3f1f296 |
+
|
|
|
3f1f296 |
+ if (r < 0) {
|
|
|
3f1f296 |
+ if (dev->cs->write_blocked) {
|
|
|
3f1f296 |
+ return 0;
|
|
|
3f1f296 |
+ }
|
|
|
3f1f296 |
+ return -1;
|
|
|
3f1f296 |
+ }
|
|
|
3f1f296 |
+
|
|
|
3f1f296 |
+ return r;
|
|
|
3f1f296 |
}
|
|
|
3f1f296 |
|
|
|
3f1f296 |
/*
|
|
|
3f1f296 |
@@ -782,10 +796,22 @@ static void usbredir_chardev_event(void *opaque, int event)
|
|
|
3f1f296 |
}
|
|
|
3f1f296 |
}
|
|
|
3f1f296 |
|
|
|
3f1f296 |
+static void usbredir_chardev_write_unblocked(void *opaque)
|
|
|
3f1f296 |
+{
|
|
|
3f1f296 |
+ USBRedirDevice *dev = opaque;
|
|
|
3f1f296 |
+
|
|
|
3f1f296 |
+ if (dev->parser == NULL) {
|
|
|
3f1f296 |
+ /* usbredir_open_close_bh hasn't handled the open event yet */
|
|
|
3f1f296 |
+ return;
|
|
|
3f1f296 |
+ }
|
|
|
3f1f296 |
+ usbredirparser_do_write(dev->parser);
|
|
|
3f1f296 |
+}
|
|
|
3f1f296 |
+
|
|
|
3f1f296 |
static const QemuChrHandlers usbredir_chr_handlers = {
|
|
|
3f1f296 |
.fd_can_read = usbredir_chardev_can_read,
|
|
|
3f1f296 |
.fd_read = usbredir_chardev_read,
|
|
|
3f1f296 |
.fd_event = usbredir_chardev_event,
|
|
|
3f1f296 |
+ .fd_write_unblocked = usbredir_chardev_write_unblocked,
|
|
|
3f1f296 |
};
|
|
|
3f1f296 |
|
|
|
3f1f296 |
/*
|
|
|
3f1f296 |
--
|
|
|
3f1f296 |
1.7.5.1
|
|
|
3f1f296 |
|