From: Peter Maydell Date: Tue, 30 Oct 2018 13:32:38 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/usb-20181029-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e8b38d737144579b291d4e3ef737be33e7798161;p=qemu.git 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) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " # 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 --- e8b38d737144579b291d4e3ef737be33e7798161