diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-30 13:32:38 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-30 13:32:38 +0000 |
| commit | e8b38d737144579b291d4e3ef737be33e7798161 (patch) | |
| tree | 3489f90ad582e5dd70d7c35302f25c95cb0bc767 /include/block/block_int.h | |
| parent | 0bbba1665ca2e7f1c80d4797077fe57bad58898e (diff) | |
| parent | 7dea29e4af17fc1d27478de9f8ea38144deac54a (diff) | |
| download | qemu-e8b38d737144579b291d4e3ef737be33e7798161.zip qemu-e8b38d737144579b291d4e3ef737be33e7798161.tar.gz qemu-e8b38d737144579b291d4e3ef737be33e7798161.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20181029-pull-request' into staging
usb: fixes for ohci and smart card emulation.
# gpg: Signature made Mon 29 Oct 2018 20:02:34 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# 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/usb-20181029-pull-request:
hw: ccid-card-emulated: cleanup resource when realize in error path
hw: ccid-card-emulated: introduce clean_event_notifier
usb: ohci: make num_ports to an unsinged integer
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/block/block_int.h')
0 files changed, 0 insertions, 0 deletions