qdev/qbus: add hidden device support

[mirror_qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index 49778e73991c12e980a138ba815a04b3443aa6d8..c389d24b2c2922297ac8a2302903d7d8583c3e2f 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -2207,10 +2207,12 @@ static int device_init_func(void *opaque, QemuOpts *opts, Error **errp)
     DeviceState *dev;
 
     dev = qdev_device_add(opts, errp);
-    if (!dev) {
+    if (!dev && *errp) {
+        error_report_err(*errp);
         return -1;
+    } else if (dev) {
+        object_unref(OBJECT(dev));
     }
-    object_unref(OBJECT(dev));
     return 0;
 }