diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2012-11-25 16:49:15 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-11-29 08:04:13 +0100 |
| commit | c128d6a6d785eb9235a4f6dbd52f405ab8c60bee (patch) | |
| tree | 9e9c7e33d5eec050825ea1d237855df4fecc12b8 /hw/usb/bus.c | |
| parent | 6c2d1c32d084320081b0cd047f8cacd6e722d03a (diff) | |
| download | qemu-c128d6a6d785eb9235a4f6dbd52f405ab8c60bee.zip qemu-c128d6a6d785eb9235a4f6dbd52f405ab8c60bee.tar.gz qemu-c128d6a6d785eb9235a4f6dbd52f405ab8c60bee.tar.bz2 | |
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>
Diffstat (limited to 'hw/usb/bus.c')
| -rw-r--r-- | hw/usb/bus.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 99aac7a..55d0edd 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); |