ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vl.c: -object: don't ignore duplicate 'id' 

object_property_add_child() may fail if 'id' matches
an already existing object. Which means an incorrect
command line.
So instead of silently ignoring error, report it and
terminate QEMU.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Igor Mammedov 2014-01-16 17:34:37 +01:00 committed by Luiz Capitulino
parent 69252c0467
commit 90e9cf28e5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vl.c
View File

@ -2800,6 +2800,7 @@ static int object_create(QemuOpts *opts, void *opaque)
{ {
const char *type = qemu_opt_get(opts, "qom-type"); const char *type = qemu_opt_get(opts, "qom-type");
const char *id = qemu_opts_id(opts); const char *id = qemu_opts_id(opts);
Error *local_err = NULL;
Object *obj; Object *obj;
g_assert(type != NULL); g_assert(type != NULL);
@ -2816,8 +2817,14 @@ static int object_create(QemuOpts *opts, void *opaque)
} }
object_property_add_child(container_get(object_get_root(), "/objects"), object_property_add_child(container_get(object_get_root(), "/objects"),
id, obj, NULL); id, obj, &local_err);
object_unref(obj); object_unref(obj);
if (local_err) {
qerror_report_err(local_err);
error_free(local_err);
return -1;
}
return 0; return 0;
} }