1. 07 3月, 2019 6 次提交
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/usb-20190307-pull-request' into staging · 3a75ef6a
      Peter Maydell 提交于
      usb: mtp fixes, guest-reset switch for usb-host.
      
      # gpg: Signature made Thu 07 Mar 2019 09:53:55 GMT
      # gpg:                using RSA key 4CB6D8EED3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/usb-20190307-pull-request:
        Introduce new "no_guest_reset" parameter for usb-host device
        usb-mtp: prevent null dereference while deleting objects
        usb-mtp: fix some usb_mtp_write_data return paths
        usb-mtp: return incomplete transfer on a lstat failure
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      3a75ef6a
    • A
      Introduce new "no_guest_reset" parameter for usb-host device · ba4c735b
      Alexander Kappner 提交于
      With certain USB devices passed through via usb-host, a guest attempting to
      reset a usb-host device can trigger a reset loop that renders the USB device
      unusable. In my use case, the device was an iPhone XR that was passed through to
      a Mac OS X Mojave guest. Upon connecting the device, the following happens:
      
      1) Guest recognizes new device, sends reset to emulated USB host
      2) QEMU's USB host sends reset to host kernel
      3) Host kernel resets device
      4) After reset, host kernel determines that some part of the device descriptor
      has changed ("device firmware changed" in dmesg), so host kernel decides to
      re-enumerate the device.
      5) Re-enumeration causes QEMU to disconnect and reconnect the device in the
      guest.
      6) goto 1)
      
      Here's from the host kernel (note the "device firmware changed" lines")
      
      [3677704.473050] usb 1-1.3: new high-speed USB device number 53 using ehci-pci
      [3677704.555594] usb 1-1.3: New USB device found, idVendor=05ac, idProduct=12a8, bcdDevice=11.08
      [3677704.555599] usb 1-1.3: New USB device strings: Mfr=1, Product=2, SerialNumber=3
      [3677704.555602] usb 1-1.3: Product: iPhone
      [3677704.555605] usb 1-1.3: Manufacturer: Apple Inc.
      [3677704.555607] usb 1-1.3: SerialNumber: [[removed]]
      [3677709.401040] usb 1-1.3: reset high-speed USB device number 53 using ehci-pci
      [3677709.479486] usb 1-1.3: device firmware changed
      [3677709.479842] usb 1-1.3: USB disconnect, device number 53
      [3677709.546039] usb 1-1.3: new high-speed USB device number 54 using ehci-pci
      [3677709.627471] usb 1-1.3: New USB device found, idVendor=05ac, idProduct=12a8, bcdDevice=11.08
      [3677709.627476] usb 1-1.3: New USB device strings: Mfr=1, Product=2, SerialNumber=3
      [3677709.627479] usb 1-1.3: Product: iPhone
      [3677709.627481] usb 1-1.3: Manufacturer: Apple Inc.
      [3677709.627483] usb 1-1.3: SerialNumber: [[removed]]
      [3677762.320044] usb 1-1.3: reset high-speed USB device number 54 using ehci-pci
      [3677762.615630] usb 1-1.3: USB disconnect, device number 54
      [3677762.787043] usb 1-1.3: new high-speed USB device number 55 using ehci-pci
      [3677762.869016] usb 1-1.3: New USB device found, idVendor=05ac, idProduct=12a8, bcdDevice=11.08
      [3677762.869024] usb 1-1.3: New USB device strings: Mfr=1, Product=2, SerialNumber=3
      [3677762.869028] usb 1-1.3: Product: iPhone
      [3677762.869032] usb 1-1.3: Manufacturer: Apple Inc.
      [3677762.869035] usb 1-1.3: SerialNumber: [[removed]]
      [3677815.662036] usb 1-1.3: reset high-speed USB device number 55 using ehci-pci
      
      Here's from QEMU:
      
      libusb: error [_get_usbfs_fd] libusb couldn't open USB device /dev/bus/usb/005/022: No such file or directory
      libusb: error [udev_hotplug_event] ignoring udev action bind
      libusb: error [udev_hotplug_event] ignoring udev action bind
      libusb: error [_open_sysfs_attr] open /sys/bus/usb/devices/5-1/bConfigurationValue failed ret=-1 errno=2
      libusb: error [_get_usbfs_fd] File doesn't exist, wait 10 ms and try again
      
      libusb: error [_get_usbfs_fd] libusb couldn't open USB device /dev/bus/usb/005/024: No such file or directory
      libusb: error [udev_hotplug_event] ignoring udev action bind
      libusb: error [udev_hotplug_event] ignoring udev action bind
      libusb: error [_open_sysfs_attr] open /sys/bus/usb/devices/5-1/bConfigurationValue failed ret=-1 errno=2
      libusb: error [_get_usbfs_fd] File doesn't exist, wait 10 ms and try again
      
      libusb: error [_get_usbfs_fd] libusb couldn't open USB device /dev/bus/usb/005/026: No such file or directory
      
      The result of this is that the device remains permanently unusable in the guest.
      The same problem has been previously reported for an iPad:
      https://stackoverflow.com/questions/52617634/how-do-i-get-qemu-usb-passthrough-to-work-for-ipad-iphone
      
      This problem can be elegantly solved by interrupting step 2) above. Instead of
      passing through the reset, QEMU simply ignores it. To allow this to be
      configured on a per-device level,  a new parameter "no_guest_reset" is
      introduced for the usb-host device. I can confirm that the configuration
      described above (iPhone XS + Mojave guest) works flawlessly with
      no_guest_reset=True specified.
      
      Working command line for my scenario:
      device_add usb-host,vendorid=0x05ac,productid=0x12a8,no_guest_reset=True,id=iphone
      
      Best regards
      Alexander
      Signed-off-by: NAlexander Kappner <agk@godking.net>
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Message-id: 20190128140027.9448-1-kraxel@redhat.com
      
      [ kraxel: rename parameter to "guest-reset" ]
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      ba4c735b
    • B
      usb-mtp: prevent null dereference while deleting objects · 7ddf8374
      Bandan Das 提交于
      Spotted by Coverity: CID 1399144
      Signed-off-by: NBandan Das <bsd@redhat.com>
      Message-id: 20190306210409.14842-4-bsd@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      7ddf8374
    • B
      usb-mtp: fix some usb_mtp_write_data return paths · 298ac63c
      Bandan Das 提交于
      During a write, free up the "path" before getting more data.
      Also, while we at it, remove the confusing usage of d->fd for
      storing mkdir status
      
      Spotted by Coverity: CID 1398642
      Signed-off-by: NBandan Das <bsd@redhat.com>
      Message-id: 20190306210409.14842-3-bsd@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      298ac63c
    • B
      usb-mtp: return incomplete transfer on a lstat failure · c5ead51f
      Bandan Das 提交于
      MTP writes objects in small chunks and at the end gets the
      real file size to update the object metadata. If this fails for
      any reason, return an INCOMPLETE_TRANSFER to the initiator
      
      Spotted by Coverity: CID 1398651
      Signed-off-by: NBandan Das <bsd@redhat.com>
      Message-id: 20190306210409.14842-2-bsd@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      c5ead51f
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging · 32694e98
      Peter Maydell 提交于
      Machine queue, 2019-03-06
      
      * qdev: Hotplug handler chaining (David Hildenbrand)
      * qdev: fix qbus_is_full() (Tony Krowiak)
      * hostmem: fix crash when querying empty host-nodes property via
        QMP (Igor Mammedov)
      
      # gpg: Signature made Wed 06 Mar 2019 18:39:29 GMT
      # gpg:                using RSA key 2807936F984DC5A6
      # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
      # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6
      
      * remotes/ehabkost/tags/machine-next-pull-request:
        qdev: Provide qdev_get_bus_hotplug_handler()
        qdev: Let machine hotplug handler to override bus hotplug handler
        qdev: Let the hotplug_handler_unplug() caller delete the device
        hostmem: fix crash when querying empty host-nodes property via QMP
        qdev/core: fix qbus_is_full()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      32694e98
  2. 06 3月, 2019 34 次提交