From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3pyc-0004AN-Az for qemu-devel@nongnu.org; Thu, 16 Jan 2014 11:39:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W3pyU-0004FM-RC for qemu-devel@nongnu.org; Thu, 16 Jan 2014 11:39:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3pyU-0004F4-Iy for qemu-devel@nongnu.org; Thu, 16 Jan 2014 11:39:22 -0500 From: Igor Mammedov Date: Thu, 16 Jan 2014 17:34:37 +0100 Message-Id: <1389890079-21853-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1389890079-21853-1-git-send-email-imammedo@redhat.com> References: <1389890079-21853-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v1 2/4] vl.c: -object: don't ingnore duplicate 'id' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: sw@weilnetz.de, mjt@tls.msk.ru, lcapitulino@redhat.com, blauwirbel@gmail.com, aliguori@amazon.com, stefanha@gmail.com, pbonzini@redhat.com, rth@twiddle.net object_property_add_child() may fail if 'id' matches an already existing object. Which meansi an incorrect command line. So instead of silently ignoring error, report it and terminate QEMU. Signed-off-by: Igor Mammedov --- vl.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index 7f4fe0d..cf3de56 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; } -- 1.7.1