From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmloS-0007fQ-Qj for qemu-devel@nongnu.org; Tue, 20 May 2014 11:18:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wmlo6-0000kQ-Vr for qemu-devel@nongnu.org; Tue, 20 May 2014 11:18:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wmlo6-0000js-Nh for qemu-devel@nongnu.org; Tue, 20 May 2014 11:18:22 -0400 From: Igor Mammedov Date: Tue, 20 May 2014 17:15:05 +0200 Message-Id: <1400598934-31921-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1400598934-31921-1-git-send-email-imammedo@redhat.com> References: <1400598934-31921-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v2 02/31] object_add: allow completion handler to get canonical path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, alex@alex.org.uk, mst@redhat.com, aik@ozlabs.ru, hutao@cn.fujitsu.com, mjt@tls.msk.ru, tangchen@cn.fujitsu.com, kraxel@redhat.com, pasteka@kabsi.at, s.priebe@profihost.ag, agarcia@igalia.com, armbru@redhat.com, aliguori@amazon.com, david@gibson.dropbear.id.au, lersek@redhat.com, ehabkost@redhat.com, marcel.a@redhat.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, rth@twiddle.net, agraf@suse.de, andrey@xdel.ru, vasilis.liaskovitis@profitbricks.com, pbonzini@redhat.com, afaerber@suse.de, aurelien@aurel32.net 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 --- qmp.c | 11 ++++++++--- vl.c | 9 +++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/qmp.c b/qmp.c index a7f432b..b722dbe 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 2de90fb..cda6220 100644 --- a/vl.c +++ b/vl.c @@ -2932,14 +2932,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.7.1