From f006cf7fa9a63ba8e4ccf57d46231ce594301727 Mon Sep 17 00:00:00 2001
From: Markus Armbruster
Date: Thu, 12 Mar 2015 14:00:41 +0100
Subject: qdev-monitor: Propagate errors through qdev_device_add()

Also polish an error message while I'm touching the line anyway,

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
---
 vl.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'vl.c')

diff --git a/vl.c b/vl.c
index 0c2208f723..fd6a5c2ee2 100644
--- a/vl.c
+++ b/vl.c
@@ -2276,11 +2276,14 @@ static int device_help_func(void *opaque, QemuOpts *opts, Error **errp)
 
 static int device_init_func(void *opaque, QemuOpts *opts, Error **errp)
 {
+    Error *err = NULL;
     DeviceState *dev;
 
-    dev = qdev_device_add(opts);
-    if (!dev)
+    dev = qdev_device_add(opts, &err);
+    if (!dev) {
+        error_report_err(err);
         return -1;
+    }
     object_unref(OBJECT(dev));
     return 0;
 }
-- 
cgit v1.2.3-55-g7522