commit 0bcdeda7e478f1ce1345585d8240e8d5a9b274d5
author Blue Swirl <blauwirbel@gmail.com> Sat Feb 05 14:34:25 2011 +0000
committer Blue Swirl <blauwirbel@gmail.com> Sat Feb 12 08:27:55 2011 +0000
tree 473aa9888c343a78772c02e1cab27f47329a989b
parent 5c81e4ca9e5c11239a9db12f0f57c6c1e24b6760

qdev: add creation function that may fail

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

hw/qdev.c

diff --git a/hw/qdev.c b/hw/qdev.c
index c7fec44..1aa1ea0 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -106,6 +106,18 @@
    initialize the actual device emulation.  */
 DeviceState *qdev_create(BusState *bus, const char *name)
 {
+    DeviceState *dev;
+
+    dev = qdev_try_create(bus, name);
+    if (!dev) {
+        hw_error("Unknown device '%s' for bus '%s'\n", name, bus->info->name);
+    }
+
+    return dev;
+}
+
+DeviceState *qdev_try_create(BusState *bus, const char *name)
+{
     DeviceInfo *info;
 
     if (!bus) {
@@ -114,7 +126,7 @@
 
     info = qdev_find_info(bus->info, name);
     if (!info) {
-        hw_error("Unknown device '%s' for bus '%s'\n", name, bus->info->name);
+        return NULL;
     }
 
     return qdev_create_from_info(bus, info);