diff mbox

[RFC,v1,19/25] qdev: Update error API usages

Message ID 3818ffba8f89d85f21ca8ce8b83a3281d578db06.1441667360.git.crosthwaite.peter@gmail.com
State New
Headers show

Commit Message

Peter Crosthwaite Sept. 11, 2015, 5:33 a.m. UTC 
Use error_prefix() and error_report_err() as appropriate.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---

 hw/core/qdev-properties.c | 7 +++----
 hw/core/qdev.c            | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 04fd80a..6494185 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -1065,10 +1065,9 @@  static void qdev_prop_set_globals_for_type(DeviceState *dev,
         object_property_parse(OBJECT(dev), prop->value, prop->property, &err);
         if (err != NULL) {
             assert(prop->user_provided);
-            error_report("Warning: global %s.%s=%s ignored (%s)",
-                         prop->driver, prop->property, prop->value,
-                         error_get_pretty(err));
-            error_free(err);
+            error_prefix(err, "Warning: global %s.%s=%s ignored (%s)",
+                         prop->driver, prop->property, prop->value);
+            error_report_err(err);
             return;
         }
     }
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 52140ba..708f5fd 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -365,9 +365,9 @@  void qdev_init_nofail(DeviceState *dev)
 
     object_property_set_bool(OBJECT(dev), true, "realized", &err);
     if (err) {
-        error_report("Initialization of device %s failed: %s",
-                     object_get_typename(OBJECT(dev)),
-                     error_get_pretty(err));
+        error_prefix(err, "Initialization of device %s failed: ",
+                     object_get_typename(OBJECT(dev)));
+        error_report_err(err);
         exit(1);
     }
 }