|
 |
329b588 |
From 2f61a7bed440164c35c739fcef10d19edef3f8ea Mon Sep 17 00:00:00 2001
|
|
 |
d4cdad5 |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
d4cdad5 |
Date: Tue, 19 Jul 2011 10:56:19 +0200
|
|
|
329b588 |
Subject: [PATCH 111/114] usb-redir: Add flow control support
|
|
|
d4cdad5 |
|
|
|
d4cdad5 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
d4cdad5 |
---
|
|
|
329b588 |
hw/usb/redirect.c | 26 ++++++++++++++++++++++++--
|
|
|
329b588 |
1 file changed, 24 insertions(+), 2 deletions(-)
|
|
|
d4cdad5 |
|
|
|
329b588 |
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
|
|
|
329b588 |
index 6e8180e..5f55d78 100644
|
|
|
329b588 |
--- a/hw/usb/redirect.c
|
|
|
329b588 |
+++ b/hw/usb/redirect.c
|
|
|
329b588 |
@@ -238,12 +238,22 @@ static int usbredir_read(void *priv, uint8_t *data, int count)
|
|
|
d4cdad5 |
static int usbredir_write(void *priv, uint8_t *data, int count)
|
|
|
d4cdad5 |
{
|
|
|
d4cdad5 |
USBRedirDevice *dev = priv;
|
|
|
d4cdad5 |
+ int r;
|
|
|
329b588 |
|
|
|
d4cdad5 |
- if (!dev->cs->opened) {
|
|
|
d4cdad5 |
+ if (!dev->cs->opened || dev->cs->write_blocked) {
|
|
|
d4cdad5 |
return 0;
|
|
|
d4cdad5 |
}
|
|
|
329b588 |
|
|
|
d4cdad5 |
- return qemu_chr_fe_write(dev->cs, data, count);
|
|
|
d4cdad5 |
+ r = qemu_chr_fe_write(dev->cs, data, count);
|
|
|
d4cdad5 |
+
|
|
|
d4cdad5 |
+ if (r < 0) {
|
|
|
d4cdad5 |
+ if (dev->cs->write_blocked) {
|
|
|
d4cdad5 |
+ return 0;
|
|
|
d4cdad5 |
+ }
|
|
|
d4cdad5 |
+ return -1;
|
|
|
d4cdad5 |
+ }
|
|
|
d4cdad5 |
+
|
|
|
d4cdad5 |
+ return r;
|
|
|
d4cdad5 |
}
|
|
|
329b588 |
|
|
|
d4cdad5 |
/*
|
|
|
329b588 |
@@ -890,10 +900,22 @@ static void usbredir_chardev_event(void *opaque, int event)
|
|
|
d4cdad5 |
}
|
|
|
d4cdad5 |
}
|
|
|
329b588 |
|
|
|
d4cdad5 |
+static void usbredir_chardev_write_unblocked(void *opaque)
|
|
|
d4cdad5 |
+{
|
|
|
d4cdad5 |
+ USBRedirDevice *dev = opaque;
|
|
|
d4cdad5 |
+
|
|
|
d4cdad5 |
+ if (dev->parser == NULL) {
|
|
|
d4cdad5 |
+ /* usbredir_open_close_bh hasn't handled the open event yet */
|
|
|
d4cdad5 |
+ return;
|
|
|
d4cdad5 |
+ }
|
|
|
d4cdad5 |
+ usbredirparser_do_write(dev->parser);
|
|
|
d4cdad5 |
+}
|
|
|
d4cdad5 |
+
|
|
|
d4cdad5 |
static const QemuChrHandlers usbredir_chr_handlers = {
|
|
|
d4cdad5 |
.fd_can_read = usbredir_chardev_can_read,
|
|
|
d4cdad5 |
.fd_read = usbredir_chardev_read,
|
|
|
d4cdad5 |
.fd_event = usbredir_chardev_event,
|
|
|
d4cdad5 |
+ .fd_write_unblocked = usbredir_chardev_write_unblocked,
|
|
|
d4cdad5 |
};
|
|
|
329b588 |
|
|
|
d4cdad5 |
/*
|
|
|
d4cdad5 |
--
|
|
|
329b588 |
1.7.10.4
|
|
|
d4cdad5 |
|