diff mbox

[v1,2/4] vl.c: -object: don't ingnore duplicate 'id'

Message ID 1389890079-21853-3-git-send-email-imammedo@redhat.com
State New
Headers show

Commit Message

Igor Mammedov Jan. 16, 2014, 4:34 p.m. UTC 
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(-)

Comments

Eric Blake Jan. 16, 2014, 4:50 p.m. UTC | #1 
On 01/16/2014 09:34 AM, Igor Mammedov wrote:

s/ingnore/ignore/ in subject

> object_property_add_child() may fail if 'id' matches
> an already existing object. Which meansi an incorrect

s/meansi/means/

> 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(-)

Fix those, and you can add:
Reviewed-by: Eric Blake <eblake@redhat.com>
diff mbox

Patch

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;
 }