mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdev: Use error_abort instead of using local_err

Browse Source 
This error can not happen normally. If it happens, it indicates
something very wrong, we should abort QEMU. Moreover, the
user can only refer to /machine/peripheral or /objects, not
/machine/unattached.

While at it, remove superfluous check about local_err.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Gonglei 2014-09-02 20:03:05 +08:00 committed by Andreas Färber
parent 843ef73a69
commit d578029e71
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/core/qdev.c
View File

@ -820,13 +820,13 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
} }
if (value && !dev->realized) { if (value && !dev->realized) {
if (!obj->parent && local_err == NULL) { if (!obj->parent) {
static int unattached_count; static int unattached_count;
gchar *name = g_strdup_printf("device[%d]", unattached_count++); gchar *name = g_strdup_printf("device[%d]", unattached_count++);
object_property_add_child(container_get(qdev_get_machine(), object_property_add_child(container_get(qdev_get_machine(),
"/unattached"), "/unattached"),
name, obj, &local_err); name, obj, &error_abort);
g_free(name); g_free(name);
} }