Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

[thirdparty/qemu.git] / hw / core / qdev.c

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index a02a4cb2ab28f6ede53d74d2661e4a71efc72a15..6be58669f706a7d61dd48e456e4c19a6a0612b49 100644 (file)
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -1196,13 +1196,7 @@ static void device_initfn(Object *obj)
 
 static void device_post_init(Object *obj)
 {
-    Error *err = NULL;
-    qdev_prop_set_globals(DEVICE(obj), &err);
-    if (err) {
-        qerror_report_err(err);
-        error_free(err);
-        exit(EXIT_FAILURE);
-    }
+    qdev_prop_set_globals(DEVICE(obj));
 }
 
 /* Unlink device from bus and free the structure.  */