From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WW4Jj-0000fd-Ll for qemu-devel@nongnu.org; Fri, 04 Apr 2014 09:38:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WW4Jd-0005un-GD for qemu-devel@nongnu.org; Fri, 04 Apr 2014 09:37:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42928) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WW4Jd-0005uf-7S for qemu-devel@nongnu.org; Fri, 04 Apr 2014 09:37:53 -0400 From: Igor Mammedov Date: Fri, 4 Apr 2014 15:36:28 +0200 Message-Id: <1396618620-27823-4-git-send-email-imammedo@redhat.com> In-Reply-To: <1396618620-27823-1-git-send-email-imammedo@redhat.com> References: <1396618620-27823-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 03/35] 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, mst@redhat.com, aik@ozlabs.ru, hutao@cn.fujitsu.com, mjt@tls.msk.ru, lcapitulino@redhat.com, kraxel@redhat.com, akong@redhat.com, quintela@redhat.com, armbru@redhat.com, aliguori@amazon.com, jan.kiszka@siemens.com, lersek@redhat.com, ehabkost@redhat.com, marcel.a@redhat.com, stefanha@redhat.com, chegu_vinod@hp.com, rth@twiddle.net, kwolf@redhat.com, s.priebe@profihost.ag, mreitz@redhat.com, vasilis.liaskovitis@profitbricks.com, pbonzini@redhat.com, afaerber@suse.de 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 | 12 ++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) 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) { -- 1.9.0