From 90e9cf28e57a3e1d6caa0a28b0a332ff982ccb0b Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Thu, 16 Jan 2014 17:34:37 +0100 Subject: 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 Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi Signed-off-by: Luiz Capitulino --- vl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'vl.c') diff --git a/vl.c b/vl.c index 7f4fe0d5df..cf3de56b7d 100644 --- a/vl.c +++ b/vl.c @@ -2800,6 +2800,7 @@ static int object_create(QemuOpts *opts, void *opaque) { const char *type = qemu_opt_get(opts, "qom-type"); const char *id = qemu_opts_id(opts); + Error *local_err = NULL; Object *obj; 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"), - id, obj, NULL); + id, obj, &local_err); + object_unref(obj); + if (local_err) { + qerror_report_err(local_err); + error_free(local_err); + return -1; + } return 0; } -- cgit v1.2.1