Commit c1ac514a authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 494edbf0 042ec47e

docs/usb-storage.txt

+12 −0
Original line number Diff line number Diff line
@@ -40,6 +40,18 @@ numbers must be continuous, i.e. for three devices you must use 0+1+2. 
The 0+1+5 numbering from the "usb-uas" example isn't going to work

with "usb-bot".



Starting with qemu version 2.7 usb-bot and usb-uas devices can be

hotplugged.  In the hotplug case they are added with "attached =

false" so the guest will not see the device until the "attached"

property is explicitly set to true.  That allows to attach one or more

scsi devices before making the device visible to the guest, i.e. the

workflow looks like this:



   (1) device-add usb-bot,id=foo

   (2) device-add scsi-{hd,cd},bus=foo.0,lun=0

   (2b) optionally add more devices (luns 1 ... 15).

   (3) scripts/qmp/qom-set foo.attached = true



enjoy,

  Gerd

hw/usb/hcd-xhci.c

+2 −1
Original line number Diff line number Diff line
@@ -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,

hw/usb/xen-usb.c

+2 −1
Original line number Diff line number Diff line
@@ -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;