diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-08-03 23:49:04 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2011-08-11 14:37:03 +0100 |
| commit | e92714c71a2f50b8420126e952cadb653fa0ef93 (patch) | |
| tree | 135455787b32b9b14d338af71d379a60dd525b94 /hw/qdev.c | |
| parent | 645a8ad6e1909d36307f37f3dc4efca9e964334a (diff) | |
| download | focaccia-qemu-e92714c71a2f50b8420126e952cadb653fa0ef93.tar.gz focaccia-qemu-e92714c71a2f50b8420126e952cadb653fa0ef93.zip | |
hw/qdev: Don't crash if qdev_create(NULL, ...) fails
If an attempt to create a qdev device on the default sysbus (by passing NULL as the bus to qdev_create) fails, print a useful error message rather than crashing trying to dereference a NULL pointer. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Diffstat (limited to 'hw/qdev.c')
| -rw-r--r-- | hw/qdev.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/qdev.c b/hw/qdev.c index 6819537648..d8114c6d93 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -111,7 +111,12 @@ DeviceState *qdev_create(BusState *bus, const char *name) dev = qdev_try_create(bus, name); if (!dev) { - hw_error("Unknown device '%s' for bus '%s'\n", name, bus->info->name); + if (bus) { + hw_error("Unknown device '%s' for bus '%s'\n", name, + bus->info->name); + } else { + hw_error("Unknown device '%s' for default sysbus\n", name); + } } return dev; |