From c6b10d4d87d8158c1b0bd8648491db8501dff784 Mon Sep 17 00:00:00 2001

From: Hans de Goede <hdegoede@redhat.com>

Date: Sat, 31 Mar 2012 13:07:24 +0200

Subject: [PATCH 144/146] 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>

---

 usb-redir.c |    5 +++--

 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usb-redir.c b/usb-redir.c

index 8ee3f07..3187b68 100644

--- a/usb-redir.c

+++ b/usb-redir.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))

@@ -995,7 +996,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;

     }

@@ -1158,7 +1159,7 @@ static void usbredir_device_disconnect(void *priv)

     for (i = 0; i < MAX_ENDPOINTS; i++) {

         QTAILQ_INIT(&dev->endpoint[i].bufpq);

     }

-    dev->interface_info.interface_count = 0;

+    dev->interface_info.interface_count = NO_INTERFACE_INFO;

 }

 static void usbredir_interface_info(void *priv,

-- 

1.7.9.3