diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-26 13:29:28 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-26 13:29:28 +0000 |
| commit | d45091e449c4202b19bb8996f8e95176c758114b (patch) | |
| tree | ebecd6a89b2a251dccd055a1758ee21869e86aaa /vl.c | |
| parent | 1867d97b372d452184c65e8fcc273cfc45937541 (diff) | |
| parent | 80ae865468bde918363a123aa26c6fc4385023ac (diff) | |
| download | focaccia-qemu-d45091e449c4202b19bb8996f8e95176c758114b.tar.gz focaccia-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 'vl.c')
| -rw-r--r-- | vl.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/vl.c b/vl.c index 6ab232095c..e517a8d995 100644 --- a/vl.c +++ b/vl.c @@ -1451,30 +1451,15 @@ static void igd_gfx_passthru(void) static int usb_device_add(const char *devname) { USBDevice *dev = NULL; -#ifndef CONFIG_LINUX - const char *p; -#endif if (!machine_usb(current_machine)) { return -1; } - /* drivers with .usbdevice_name entry in USBDeviceInfo */ dev = usbdevice_create(devname); - if (dev) - goto done; - - /* the other ones */ -#ifndef CONFIG_LINUX - /* only the linux version is qdev-ified, usb-bsd still needs this */ - if (strstart(devname, "host:", &p)) { - dev = usb_host_device_open(usb_bus_find(-1), p); - } -#endif if (!dev) return -1; -done: return 0; } |