summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2011-06-01 14:41:59 +0200
committerGerd Hoffmann <kraxel@redhat.com>2011-06-14 12:56:49 +0200
commite447fc63530bcd0e50201da3b06e112eab1a851d (patch)
tree545d9cd01188f85e3af79f7bccd802bd9b096458
parent1f45a81bef8bc4aee98e29bd28bfb21edb623879 (diff)
downloadqemu-e447fc63530bcd0e50201da3b06e112eab1a851d.zip
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>
-rw-r--r--vl.c6
1 files changed, 5 insertions, 1 deletions
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 {