summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorRoy Tam <roytam@gmail.com>2011-09-15 11:25:47 +0800
committerGerd Hoffmann <kraxel@redhat.com>2011-11-01 16:38:27 +0100
commitdb80358a20e2597a0844998c832b2dce667d0aa0 (patch)
tree46c9535fffcf05f6c52dd09ba5eaf2caea5b6e25
parent4a33a9ea06f6fbb08d8311a7cfed72975344f9ab (diff)
downloadfocaccia-qemu-db80358a20e2597a0844998c832b2dce667d0aa0.tar.gz
focaccia-qemu-db80358a20e2597a0844998c832b2dce667d0aa0.zip
usb: change VID/PID for usb-hub and usb-msd to prevent conflict
Some USB drivers, for example USBASPI.SYS, will skip different type of
device which has same VID/PID. The following patch helps preventing
usb-msd being skipped by the driver.

Signed-off-by: Roy Tam <roytam@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/usb-hub.c4
-rw-r--r--hw/usb-msd.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/hw/usb-hub.c b/hw/usb-hub.c
index 7b47079ac4..3eb0f1aa0a 100644
--- a/hw/usb-hub.c
+++ b/hw/usb-hub.c
@@ -127,8 +127,8 @@ static const USBDescDevice desc_device_hub = {
 
 static const USBDesc desc_hub = {
     .id = {
-        .idVendor          = 0,
-        .idProduct         = 0,
+        .idVendor          = 0x0409,
+        .idProduct         = 0x55aa,
         .bcdDevice         = 0x0101,
         .iManufacturer     = STR_MANUFACTURER,
         .iProduct          = STR_PRODUCT,
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index 1a0815a136..b7341778e6 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -162,8 +162,8 @@ static const USBDescDevice desc_device_high = {
 
 static const USBDesc desc = {
     .id = {
-        .idVendor          = 0,
-        .idProduct         = 0,
+        .idVendor          = 0x46f4, /* CRC16() of "QEMU" */
+        .idProduct         = 0x0001,
         .bcdDevice         = 0,
         .iManufacturer     = STR_MANUFACTURER,
         .iProduct          = STR_PRODUCT,