diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-08-22 15:10:51 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-22 15:10:51 +0100 |
| commit | 4a71d0af7b9c4ab861c9db2111db73771999c81b (patch) | |
| tree | 4f472d6356a0ab976e78786620915d6761c39a75 /qemu-options.hx | |
| parent | d86766a9d0e5c4d9cfb2186bf0b7a6f0f17e1831 (diff) | |
| parent | 1be344b7ad25d572dadeee46d80f0103354352b2 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20190822-pull-request' into staging
usb: bugfixes and minor improvements.
# gpg: Signature made Thu 22 Aug 2019 07:52:32 BST
# 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-20190822-pull-request:
ehci: fix queue->dev null ptr dereference
usb: reword -usb command-line option and mention xHCI
xhci: Add No Op Command
usb-redir: merge interrupt packets
usbredir: fix buffer-overflow on vmload
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index a308e5f5aa..ea0638e92d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1436,12 +1436,15 @@ STEXI ETEXI DEF("usb", 0, QEMU_OPTION_usb, - "-usb enable the USB driver (if it is not used by default yet)\n", + "-usb enable on-board USB host controller (if not enabled by default)\n", QEMU_ARCH_ALL) STEXI @item -usb @findex -usb -Enable the USB driver (if it is not used by default yet). +Enable USB emulation on machine types with an on-board USB host controller (if +not enabled by default). Note that on-board USB host controllers may not +support USB 3.0. In this case @option{-device qemu-xhci} can be used instead +on machines with PCI. ETEXI DEF("usbdevice", HAS_ARG, QEMU_OPTION_usbdevice, |