From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 1 Jun 2011 12:41:59 +0000 (+0200)
Subject: usb: don't call usb_host_device_open from vl.c
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e447fc63530bcd0e50201da3b06e112eab1a851d;p=qemu.git

usb: don't call usb_host_device_open from vl.c

Not needed any more, usb-host is qdev-ified these days.
Well, at least the linux version ...

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/vl.c b/vl.c
index d7f905df3a..c1cc614666 100644
--- a/vl.c
+++ b/vl.c
@@ -925,9 +925,13 @@ static int usb_device_add(const char *devname)
         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(p);
-    } else if (!strcmp(devname, "bt") || strstart(devname, "bt:", &p)) {
+    } else
+#endif
+    if (!strcmp(devname, "bt") || strstart(devname, "bt:", &p)) {
         dev = usb_bt_init(devname[2] ? hci_init(p) :
                         bt_new_hci(qemu_find_bt_vlan(0)));
     } else {