diff options
| author | Peter Maydell | 2016-07-12 13:03:29 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-07-12 13:03:29 +0200 |
| commit | c1ac514a0444cae0a822dd9a0e60ac77918c102c (patch) | |
| tree | 4f5375de003ec2848955a4878fc1e4ac22b98d73 /hw/usb/xen-usb.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20160712-1' into... (diff) | |
| parent | xen-usb: Fix 32bit build (diff) | |
| download | qemu-c1ac514a0444cae0a822dd9a0e60ac77918c102c.tar.gz qemu-c1ac514a0444cae0a822dd9a0e60ac77918c102c.tar.xz qemu-c1ac514a0444cae0a822dd9a0e60ac77918c102c.zip | |
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/usb/xen-usb.c')
| -rw-r--r-- | hw/usb/xen-usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index 0fd34c62c4..7bed0cebe3 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; |