qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Igor Mammedov <imammedo@redhat.com>
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
Subject: [Qemu-devel] [PATCH v1 2/4] vl.c: -object: don't ingnore duplicate 'id'
Date: Thu, 16 Jan 2014 17:34:37 +0100	[thread overview]
Message-ID: <1389890079-21853-3-git-send-email-imammedo@redhat.com> (raw)
In-Reply-To: <1389890079-21853-1-git-send-email-imammedo@redhat.com>

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 <imammedo@redhat.com>
---
 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

  parent reply	other threads:[~2014-01-16 16:39 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-16 16:34 [Qemu-devel] [PATCH v1 0/4] -object/object-add add 2nd stage initialization Igor Mammedov
2014-01-16 16:34 ` [Qemu-devel] [PATCH v1 1/4] object_add: consolidate error handling Igor Mammedov
2014-01-16 16:34 ` Igor Mammedov [this message]
2014-01-16 16:50   ` [Qemu-devel] [PATCH v1 2/4] vl.c: -object: don't ingnore duplicate 'id' Eric Blake
2014-01-16 16:34 ` [Qemu-devel] [PATCH v1 3/4] add optional 2nd stage initialization to -object/object-add commands Igor Mammedov
2014-01-16 16:34 ` [Qemu-devel] [PATCH v1 4/4] virtio_rng: replace custom backend API with UserCreatable.complete() callback Igor Mammedov
2014-08-09  4:32   ` Amos Kong
2014-01-17  7:10 ` [Qemu-devel] [PATCH v1 0/4] -object/object-add add 2nd stage initialization Stefan Hajnoczi
2014-01-22 18:33 ` Luiz Capitulino

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1389890079-21853-3-git-send-email-imammedo@redhat.com \
    --to=imammedo@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=blauwirbel@gmail.com \
    --cc=lcapitulino@redhat.com \
    --cc=mjt@tls.msk.ru \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=stefanha@gmail.com \
    --cc=sw@weilnetz.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).