From: Peter Maydell Date: Fri, 26 Jan 2018 13:29:28 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180126-v3-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d45091e449c4202b19bb8996f8e95176c758114b;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180126-v3-pull-request' into staging usb: -usbdevice cleanups, storage fix, QOMify ccid. # gpg: Signature made Fri 26 Jan 2018 08:04:49 GMT # gpg: using RSA key 0x4CB6D8EED3E87138 # 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-20180126-v3-pull-request: usb-ccid: convert CCIDCardClass::exitfn() -> unrealize() usb-ccid: inline ccid_card_initfn() in ccid_card_realize() hw/usb/ccid: Make ccid_card_init() take an error parameter usb-storage: Fix share-rw option parsing usb: Remove legacy -usbdevice options (host, serial, disk and net) Signed-off-by: Peter Maydell --- d45091e449c4202b19bb8996f8e95176c758114b