From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Sun, 25 Nov 2012 15:49:15 +0000 (+0100)
Subject: usb: fail usbdevice_create() when there is no USB bus
X-Git-Tag: qemu-xen-4.3.0-rc1~17^2~6^2~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c128d6a6d785eb9235a4f6dbd52f405ab8c60bee;p=qemu-upstream-4.4-testing.git

usb: fail usbdevice_create() when there is no USB bus

Report an error instead of segfaulting when attaching a USB device to a
machine with no USB busses:

  $ qemu-system-arm -machine vexpress-a9 \
      -sd Fedora-17-armhfp-vexpress-mmcblk0.img \
      -kernel vmlinuz-3.4.2-3.fc17.armv7hl \
      -initrd initramfs-3.4.2-3.fc17.armv7hl.img \
      -usbdevice disk:format=raw:test.img

Note that the vexpress-a9 machine does not have a USB host controller.

Reported-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 99aac7a2c..55d0edd5c 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -590,6 +590,13 @@ USBDevice *usbdevice_create(const char *cmdline)
         return NULL;
     }
 
+    if (!bus) {
+        error_report("Error: no usb bus to attach usbdevice %s, "
+                     "please try -machine usb=on and check that "
+                     "the machine model supports USB", driver);
+        return NULL;
+    }
+
     if (!f->usbdevice_init) {
         if (*params) {
             error_report("usbdevice %s accepts no params", driver);