diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-30 13:55:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-30 13:55:27 +0100 |
| commit | 48a8b399619cf3bb745a2e052f9fec142f14d75d (patch) | |
| tree | 9d3d9eb66b202482b887402c62856fcaff68df01 /hw/core | |
| parent | 95172e24051ce48237f371849498bfc1027df578 (diff) | |
| parent | 442bac16a6cd708a9f87adb0a263f9d833f03ed5 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20190529-pull-request' into staging
usb-hub: port count config option, emulate power switching, cleanups.
usb-tablet, usb-host: bugfixes.
# gpg: Signature made Wed 29 May 2019 07:28:18 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-20190529-pull-request:
usb-tablet: fix serial compat property
usb-hub: emulate per port power switching
usb-hub: add usb_hub_port_update()
usb-hub: add helpers to update port state
usb-hub: make number of ports runtime-configurable
usb-hub: tweak feature names
usb-host: avoid libusb_set_configuration calls
usb-host: skip reset for untouched devices
usb: call reset handler before updating state
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index 934c1bcceb..16ba667434 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -36,7 +36,7 @@ GlobalProperty hw_compat_3_1[] = { { "tpm-tis", "ppi", "false" }, { "usb-kbd", "serial", "42" }, { "usb-mouse", "serial", "42" }, - { "usb-kbd", "serial", "42" }, + { "usb-tablet", "serial", "42" }, { "virtio-blk-device", "discard", "false" }, { "virtio-blk-device", "write-zeroes", "false" }, }; |