Fix broken USB support for Linux host (Bjorn Danielsson)
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Tue, 21 Oct 2008 16:27:28 +0000 (16:27 +0000)
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Tue, 21 Oct 2008 16:27:28 +0000 (16:27 +0000)
Make "host:" usb devices work again on systems that have the
file /proc/bus/usb/devices. This was broken in r5441 due to
incorrect logic for the USB_FS_SYS case in usb_host_scan().

Signed-off-by: Bjorn Danielsson <bdq@dax.nu>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5507 c046a42c-6fe2-441c-8c8c-71466251a162

usb-linux.c

index 6113a0c..7e94c6a 100644 (file)
@@ -1293,7 +1293,8 @@ static int usb_host_scan(void *opaque, USBScanFunc *func)
             usb_fs_type = USB_FS_SYS;
             closedir(dir);
             dprintf(opened, USBSYSBUS_PATH, devices);
-        } else {
+        }
+        if (!usb_fs_type) {
             term_printf("husb: unable to access USB devices\n");
             goto the_end;
         }