openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb-redir: Add flow control support 

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2013-03-19 14:54:38 +01:00 committed by Gerd Hoffmann
parent 3713e1485e
commit c874ea97b9
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/usb/redirect.c
View File

@ -104,6 +104,8 @@ struct USBRedirDevice {
/* Data passed from chardev the fd_read cb to the usbredirparser read cb */ /* Data passed from chardev the fd_read cb to the usbredirparser read cb */
const uint8_t *read_buf; const uint8_t *read_buf;
int read_buf_size; int read_buf_size;
/* Active chardev-watch-tag */
guint watch;
/* For async handling of close */ /* For async handling of close */
QEMUBH *chardev_close_bh; QEMUBH *chardev_close_bh;
/* To delay the usb attach in case of quick chardev close + open */ /* 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; 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) static int usbredir_write(void *priv, uint8_t *data, int count)
{ {
USBRedirDevice *dev = priv; USBRedirDevice *dev = priv;
int r;
if (!dev->cs->be_open) { if (!dev->cs->be_open) {
return 0; return 0;
@ -267,7 +281,17 @@ static int usbredir_write(void *priv, uint8_t *data, int count)
return 0; 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); usbredirparser_destroy(dev->parser);
dev->parser = NULL; dev->parser = NULL;
} }
if (dev->watch) {
g_source_remove(dev->watch);
dev->watch = 0;
}
} }
static void usbredir_create_parser(USBRedirDevice *dev) static void usbredir_create_parser(USBRedirDevice *dev)
@ -1317,6 +1345,9 @@ static void usbredir_handle_destroy(USBDevice *udev)
if (dev->parser) { if (dev->parser) {
usbredirparser_destroy(dev->parser); usbredirparser_destroy(dev->parser);
} }
if (dev->watch) {
g_source_remove(dev->watch);
}
free(dev->filter_rules); free(dev->filter_rules);
} }