diff mbox

[03/35] object_add: allow completion handler to get canonical path

Message ID 1396618620-27823-4-git-send-email-imammedo@redhat.com
State New
Headers show

Commit Message

Igor Mammedov April 4, 2014, 1:36 p.m. UTC 
Add object to /objects before calling user_creatable_complete()
handler, so that object might be able to call
object_get_canonical_path() in its completion handler.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 qmp.c | 11 ++++++++---
 vl.c  | 12 ++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/qmp.c b/qmp.c
index 87a28f7..ac8693d 100644
--- a/qmp.c
+++ b/qmp.c
@@ -564,13 +564,18 @@  void object_add(const char *type, const char *id, const QDict *qdict,
         goto out;
     }
 
-    user_creatable_complete(obj, &local_err);
+    object_property_add_child(container_get(object_get_root(), "/objects"),
+                              id, obj, &local_err);
     if (local_err) {
         goto out;
     }
 
-    object_property_add_child(container_get(object_get_root(), "/objects"),
-                              id, obj, &local_err);
+    user_creatable_complete(obj, &local_err);
+    if (local_err) {
+        object_property_del(container_get(object_get_root(), "/objects"),
+                            id, &error_abort);
+        goto out;
+    }
 out:
     if (local_err) {
         error_propagate(errp, local_err);
diff --git a/vl.c b/vl.c
index 67fd5bb..2181b41 100644
--- a/vl.c
+++ b/vl.c
@@ -2914,14 +2914,18 @@  static int object_create(QemuOpts *opts, void *opaque)
         goto out;
     }
 
-    user_creatable_complete(obj, &local_err);
+    object_property_add_child(container_get(object_get_root(), "/objects"),
+                              id, obj, &local_err);
     if (local_err) {
         goto out;
     }
 
-    object_property_add_child(container_get(object_get_root(), "/objects"),
-                              id, obj, &local_err);
-
+    user_creatable_complete(obj, &local_err);
+    if (local_err) {
+        object_property_del(container_get(object_get_root(), "/objects"),
+                            id, &error_abort);
+        goto out;
+    }
 out:
     object_unref(obj);
     if (local_err) {