mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb-redir: Add support for 32 bits bulk packet length

Browse Source 
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 2012-10-31 13:47:11 +01:00 committed by Gerd Hoffmann
parent 579967bea6
commit c19a798133
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -2755,7 +2755,7 @@ fi
# check for usbredirparser for usb network redirection support # check for usbredirparser for usb network redirection support
if test "$usb_redir" != "no" ; then if test "$usb_redir" != "no" ; then
if $pkg_config --atleast-version=0.5 libusbredirparser-0.5 >/dev/null 2>&1 ; then if $pkg_config --atleast-version=0.5.3 libusbredirparser-0.5 >/dev/null 2>&1 ; then
usb_redir="yes" usb_redir="yes"
usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5 2>/dev/null) usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5 2>/dev/null)
usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5 2>/dev/null) usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5 2>/dev/null)

7
hw/usb/redirect.c
View File

@ -575,6 +575,10 @@ static int usbredir_handle_bulk_data(USBRedirDevice *dev, USBPacket *p,
bulk_packet.endpoint = ep; bulk_packet.endpoint = ep;
bulk_packet.length = p->iov.size; bulk_packet.length = p->iov.size;
bulk_packet.stream_id = 0; bulk_packet.stream_id = 0;
bulk_packet.length_high = p->iov.size >> 16;
assert(bulk_packet.length_high == 0 ||
usbredirparser_peer_has_cap(dev->parser,
usb_redir_cap_32bits_bulk_length));
if (ep & USB_DIR_IN) { if (ep & USB_DIR_IN) {
usbredirparser_send_bulk_packet(dev->parser, p->id, usbredirparser_send_bulk_packet(dev->parser, p->id,
@ -896,6 +900,7 @@ static void usbredir_create_parser(USBRedirDevice *dev)
usbredirparser_caps_set_cap(caps, usb_redir_cap_filter); usbredirparser_caps_set_cap(caps, usb_redir_cap_filter);
usbredirparser_caps_set_cap(caps, usb_redir_cap_ep_info_max_packet_size); usbredirparser_caps_set_cap(caps, usb_redir_cap_ep_info_max_packet_size);
usbredirparser_caps_set_cap(caps, usb_redir_cap_64bits_ids); usbredirparser_caps_set_cap(caps, usb_redir_cap_64bits_ids);
usbredirparser_caps_set_cap(caps, usb_redir_cap_32bits_bulk_length);
if (runstate_check(RUN_STATE_INMIGRATE)) { if (runstate_check(RUN_STATE_INMIGRATE)) {
flags |= usbredirparser_fl_no_hello; flags |= usbredirparser_fl_no_hello;
@ -1452,7 +1457,7 @@ static void usbredir_bulk_packet(void *priv, uint64_t id,
{ {
USBRedirDevice *dev = priv; USBRedirDevice *dev = priv;
uint8_t ep = bulk_packet->endpoint; uint8_t ep = bulk_packet->endpoint;
int len = bulk_packet->length; int len = (bulk_packet->length_high << 16) | bulk_packet->length;
USBPacket *p; USBPacket *p;
DPRINTF("bulk-in status %d ep %02X len %d id %"PRIu64"\n", DPRINTF("bulk-in status %d ep %02X len %d id %"PRIu64"\n",