diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-01 13:09:31 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-01 13:09:31 -0500 |
| commit | 2ff6458116546ced7ce00cc39423ee30b1477e67 (patch) | |
| tree | d15aa8e6a07862dbea9ad9d6886ad29696fbf9b2 /hw | |
| parent | 0ffcb2ca8d7508f0e60035a17f3a8e055a7a1b89 (diff) | |
| parent | 39fba3ada9a9e36a29a40e1acddec0923839c39b (diff) | |
Merge remote-tracking branch 'kraxel/usb.29' into staging
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/usb-hub.c | 5 | ||||
| -rw-r--r-- | hw/usb-msd.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/hw/usb-hub.c b/hw/usb-hub.c index 09c65160c2..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, @@ -163,6 +163,7 @@ static void usb_hub_attach(USBPort *port1) } else { port->wPortStatus &= ~PORT_STAT_LOW_SPEED; } + usb_wakeup(&s->dev); } static void usb_hub_detach(USBPort *port1) 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, |