diff options
| author | Paul Brook | 2010-02-25 14:29:06 +0100 |
|---|---|---|
| committer | Paul Brook | 2010-02-25 14:29:06 +0100 |
| commit | d44168fffa07fc57e61a37da65e9348661dec887 (patch) | |
| tree | f3a41713d7a4e7cdef21cd3a7c2f5a49104f2368 | |
| parent | ARM defconfig fix (diff) | |
| download | qemu-d44168fffa07fc57e61a37da65e9348661dec887.tar.gz qemu-d44168fffa07fc57e61a37da65e9348661dec887.tar.xz qemu-d44168fffa07fc57e61a37da65e9348661dec887.zip | |
Fix -usbdevice crash
If -usbdevice is used on a machine with no USB busses, usb_create
will fail and return NULL. Patch below handles this failure gracefully
rather than crashing when we try to init the device.
Signed-off-by: Paul Brook <paul@codesourcery.com>
| -rw-r--r-- | hw/usb-bus.c | 3 | ||||
| -rw-r--r-- | hw/usb-msd.c | 3 | ||||
| -rw-r--r-- | hw/usb-net.c | 3 | ||||
| -rw-r--r-- | hw/usb-serial.c | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/hw/usb-bus.c b/hw/usb-bus.c index 54027dfc41..7c823147ab 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -102,6 +102,9 @@ USBDevice *usb_create(USBBus *bus, const char *name) USBDevice *usb_create_simple(USBBus *bus, const char *name) { USBDevice *dev = usb_create(bus, name); + if (!dev) { + hw_error("Failed to create USB device '%s'\n", name); + } qdev_init_nofail(&dev->qdev); return dev; } diff --git a/hw/usb-msd.c b/hw/usb-msd.c index 36991f8833..1a11bc557e 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -592,6 +592,9 @@ static USBDevice *usb_msd_init(const char *filename) /* create guest device */ dev = usb_create(NULL /* FIXME */, "usb-storage"); + if (!dev) { + return NULL; + } qdev_prop_set_drive(&dev->qdev, "drive", dinfo); if (qdev_init(&dev->qdev) < 0) return NULL; diff --git a/hw/usb-net.c b/hw/usb-net.c index cfd2f62e09..6875f112fe 100644 --- a/hw/usb-net.c +++ b/hw/usb-net.c @@ -1491,6 +1491,9 @@ static USBDevice *usb_net_init(const char *cmdline) } dev = usb_create(NULL /* FIXME */, "usb-net"); + if (!dev) { + return NULL; + } qdev_set_nic_properties(&dev->qdev, &nd_table[idx]); qdev_init_nofail(&dev->qdev); return dev; diff --git a/hw/usb-serial.c b/hw/usb-serial.c index c3f3401370..1410b11b2b 100644 --- a/hw/usb-serial.c +++ b/hw/usb-serial.c @@ -594,6 +594,9 @@ static USBDevice *usb_serial_init(const char *filename) return NULL; dev = usb_create(NULL /* FIXME */, "usb-serial"); + if (!dev) { + return NULL; + } qdev_prop_set_chr(&dev->qdev, "chardev", cdrv); if (vendorid) qdev_prop_set_uint16(&dev->qdev, "vendorid", vendorid); |