ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb-redir: An interface count of 0 is a valid value 

An interface-count of 0 happens when a device is in unconfigured state when
it gets redirected. So we should not use 0 to detect not having received
interface info from our peer.

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-03-31 17:14:21 +02:00 committed by Gerd Hoffmann
parent 215bff17ed
commit 1510168e27
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/usb/redirect.c
View File

@ -39,6 +39,7 @@
#include "hw/usb.h" #include "hw/usb.h"
#define MAX_ENDPOINTS 32 #define MAX_ENDPOINTS 32
#define NO_INTERFACE_INFO 255 /* Valid interface_count always <= 32 */
#define EP2I(ep_address) (((ep_address & 0x80) >> 3) | (ep_address & 0x0f)) #define EP2I(ep_address) (((ep_address & 0x80) >> 3) | (ep_address & 0x0f))
#define I2EP(i) (((i & 0x10) << 3) | (i & 0x0f)) #define I2EP(i) (((i & 0x10) << 3) | (i & 0x0f))
@ -970,7 +971,7 @@ static void usbredir_handle_destroy(USBDevice *udev)
static int usbredir_check_filter(USBRedirDevice *dev) static int usbredir_check_filter(USBRedirDevice *dev)
{ {
if (dev->interface_info.interface_count == 0) { if (dev->interface_info.interface_count == NO_INTERFACE_INFO) {
ERROR("No interface info for device\n"); ERROR("No interface info for device\n");
goto error; goto error;
} }
@ -1134,7 +1135,7 @@ static void usbredir_device_disconnect(void *priv)
QTAILQ_INIT(&dev->endpoint[i].bufpq); QTAILQ_INIT(&dev->endpoint[i].bufpq);
} }
usb_ep_init(&dev->dev); usb_ep_init(&dev->dev);
dev->interface_info.interface_count = 0; dev->interface_info.interface_count = NO_INTERFACE_INFO;
} }
static void usbredir_interface_info(void *priv, static void usbredir_interface_info(void *priv,