diff options
| -rw-r--r-- | qmp.c | 11 | ||||
| -rw-r--r-- | vl.c | 9 |
2 files changed, 13 insertions, 7 deletions
diff --git a/qmp.c b/qmp.c index a7f432b37e..b722dbec9a 100644 --- a/qmp.c +++ b/qmp.c @@ -565,13 +565,18 @@ void object_add(const char *type, const char *id, const QDict *qdict, } } - 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 be69c7f346..9ce65fc3dd 100644 --- a/vl.c +++ b/vl.c @@ -2935,14 +2935,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) { |