From: Igor Mammedov <imamm...@redhat.com> 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 <imamm...@redhat.com> --- qmp.c | 8 +++++--- vl.c | 9 +++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/qmp.c b/qmp.c index d0d98e7..2ff943d 100644 --- a/qmp.c +++ b/qmp.c @@ -561,13 +561,15 @@ void object_add(const char *type, const char *id, const QDict *qdict, 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; } - - object_property_add_child(container_get(object_get_root(), "/objects"), - id, obj, &local_err); out: if (local_err) { error_propagate(errp, local_err); diff --git a/vl.c b/vl.c index 899b63f..7d9ac8a 100644 --- a/vl.c +++ b/vl.c @@ -2673,14 +2673,15 @@ static int object_create(QemuOpts *opts, void *opaque) 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; } - - object_property_add_child(container_get(object_get_root(), "/objects"), - id, obj, &local_err); - out: object_unref(obj); if (local_err) { -- 1.8.5.2.229.g4448466