diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-12 12:03:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-12 12:03:29 +0100 |
| commit | c1ac514a0444cae0a822dd9a0e60ac77918c102c (patch) | |
| tree | 4f5375de003ec2848955a4878fc1e4ac22b98d73 /hw | |
| parent | 494edbf0b499e342d466e3dea334fd6ae1d56278 (diff) | |
| parent | 042ec47e6825cbea67b9ad957780204dc1d346bc (diff) | |
| download | qemu-c1ac514a0444cae0a822dd9a0e60ac77918c102c.zip qemu-c1ac514a0444cae0a822dd9a0e60ac77918c102c.tar.gz qemu-c1ac514a0444cae0a822dd9a0e60ac77918c102c.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160712-1' into staging
usb: misc fixes.
# gpg: Signature made Tue 12 Jul 2016 09:47:21 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-usb-20160712-1:
xen-usb: Fix 32bit build
usb: add storage hotplug documentation
nec-usb-xhci: set the device state to USB_STATE_DEFAULT
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/usb/hcd-xhci.c | 3 | ||||
| -rw-r--r-- | hw/usb/xen-usb.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 1a3377f..976bfb0 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -2364,6 +2364,8 @@ static TRBCCode xhci_address_slot(XHCIState *xhci, unsigned int slotid, slot->uport = uport; slot->ctx = octx; + /* Make sure device is in USB_STATE_DEFAULT state */ + usb_device_reset(dev); if (bsr) { slot_ctx[3] = SLOT_DEFAULT << SLOT_STATE_SHIFT; } else { @@ -2371,7 +2373,6 @@ static TRBCCode xhci_address_slot(XHCIState *xhci, unsigned int slotid, uint8_t buf[1]; slot_ctx[3] = (SLOT_ADDRESSED << SLOT_STATE_SHIFT) | slotid; - usb_device_reset(dev); memset(&p, 0, sizeof(p)); usb_packet_addbuf(&p, buf, sizeof(buf)); usb_packet_setup(&p, USB_TOKEN_OUT, diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index 0fd34c6..7bed0ce 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -253,7 +253,8 @@ static int usbback_init_packet(struct usbback_req *usbback_req) case USBIF_PIPE_TYPE_CTRL: packet->parameter = *(uint64_t *)usbback_req->req.u.ctrl; - TR_REQ(xendev, "ctrl parameter: %lx, buflen: %x\n", packet->parameter, + TR_REQ(xendev, "ctrl parameter: %"PRIx64", buflen: %x\n", + packet->parameter, usbback_req->req.buffer_length); break; |