diff options
| author | Peter Maydell | 2018-01-26 14:29:28 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-01-26 14:29:28 +0100 |
| commit | d45091e449c4202b19bb8996f8e95176c758114b (patch) | |
| tree | ebecd6a89b2a251dccd055a1758ee21869e86aaa /include/hw/usb.h | |
| parent | Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-signed' int... (diff) | |
| parent | usb-ccid: convert CCIDCardClass::exitfn() -> unrealize() (diff) | |
| download | qemu-d45091e449c4202b19bb8996f8e95176c758114b.tar.gz qemu-d45091e449c4202b19bb8996f8e95176c758114b.tar.xz qemu-d45091e449c4202b19bb8996f8e95176c758114b.zip | |
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) <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-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 <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/usb.h')
| -rw-r--r-- | include/hw/usb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/usb.h b/include/hw/usb.h index 9dd9c6f0d9..a5080adecc 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -466,7 +466,6 @@ void usb_wakeup(USBEndpoint *ep, unsigned int stream); void usb_generic_async_ctrl_complete(USBDevice *s, USBPacket *p); /* usb-linux.c */ -USBDevice *usb_host_device_open(USBBus *bus, const char *devname); void hmp_info_usbhost(Monitor *mon, const QDict *qdict); bool usb_host_dev_is_scsi_storage(USBDevice *usbdev); |