diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-23 11:18:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-23 11:18:57 +0100 |
| commit | c6eb076aecbe85e816a320d03d8dc1951be97efd (patch) | |
| tree | 02c08e54f01a42d4341e1f6c9bad742e8c07b99b /include | |
| parent | 59a79f65ba1eb197609532b52df7d48617c75b33 (diff) | |
| parent | 0d4cf3e72aadc40aa866fef7ceb82dfbfdc9ac47 (diff) | |
| download | qemu-c6eb076aecbe85e816a320d03d8dc1951be97efd.zip qemu-c6eb076aecbe85e816a320d03d8dc1951be97efd.tar.gz qemu-c6eb076aecbe85e816a320d03d8dc1951be97efd.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160622-2' into staging
usb: add hotplug support for usb-bot and usb-uas.
# gpg: Signature made Wed 22 Jun 2016 12:45:46 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-20160622-2:
usb-uas: hotplug support
usb-bot: hotplug support
usb: Add QOM property "attached".
usb: make USBDevice->attached bool
usb-storage: qcow2 encryption support is finally gone, zap dead code
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/usb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/hw/usb.h b/include/hw/usb.h index 163fe04..847c9de 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -235,7 +235,7 @@ struct USBDevice { uint8_t addr; char product_desc[32]; int auto_attach; - int attached; + bool attached; int32_t state; uint8_t setup_buf[8]; @@ -347,6 +347,7 @@ typedef struct USBDeviceClass { const char *product_desc; const USBDesc *usb_desc; + bool attached_settable; } USBDeviceClass; typedef struct USBPortOps { |