Patchwork [1/3] usb-redir: An interface count of 0 is a valid value

login
register
mail settings
Submitter Hans de Goede
Date March 31, 2012, 3:14 p.m.
Message ID <1333206863-11425-1-git-send-email-hdegoede@redhat.com>
Download mbox | patch
Permalink /patch/149836/
State New
Headers show

Comments

Hans de Goede - March 31, 2012, 3:14 p.m.
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>
---
 hw/usb/redirect.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Gerd Hoffmann - April 19, 2012, 12:18 p.m.
On 03/31/12 17:14, Hans de Goede wrote:
> 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.

All three patches added to usb patch queue.

thanks,
  Gerd

Patch

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index c9d22e4..9cea7c1 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -39,6 +39,7 @@ 
 #include "hw/usb.h"
 
 #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 I2EP(i) (((i & 0x10) << 3) | (i & 0x0f))
 
@@ -968,7 +969,7 @@  static void usbredir_handle_destroy(USBDevice *udev)
 
 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");
         goto error;
     }
@@ -1132,7 +1133,7 @@  static void usbredir_device_disconnect(void *priv)
         QTAILQ_INIT(&dev->endpoint[i].bufpq);
     }
     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,