Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20200704' into staging

[mirror_qemu.git] / bootdevice.c

diff --git a/bootdevice.c b/bootdevice.c
index 03aaffcc8de92230e2b17363575eabf4b1c64789..0ff55e2b79d9e010d7901c67f9db4d8820e22552 100644 (file)
--- a/bootdevice.c
+++ b/bootdevice.c
@@ -327,9 +327,8 @@ static void property_release_bootindex(Object *obj, const char *name,
 
 void device_add_bootindex_property(Object *obj, int32_t *bootindex,
                                    const char *name, const char *suffix,
-                                   DeviceState *dev, Error **errp)
+                                   DeviceState *dev)
 {
-    Error *local_err = NULL;
     BootIndexProperty *prop = g_malloc0(sizeof(*prop));
 
     prop->bootindex = bootindex;
@@ -340,13 +339,8 @@ void device_add_bootindex_property(Object *obj, int32_t *bootindex,
                         device_get_bootindex,
                         device_set_bootindex,
                         property_release_bootindex,
-                        prop, &local_err);
+                        prop);
 
-    if (local_err) {
-        error_propagate(errp, local_err);
-        g_free(prop);
-        return;
-    }
     /* initialize devices' bootindex property to -1 */
     object_property_set_int(obj, -1, name, NULL);
 }