From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxIW5-0006yy-MP for qemu-devel@nongnu.org; Wed, 18 Jun 2014 12:15:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxIVz-0005Pj-CB for qemu-devel@nongnu.org; Wed, 18 Jun 2014 12:15:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58131) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxIVz-0005PQ-2X for qemu-devel@nongnu.org; Wed, 18 Jun 2014 12:15:11 -0400 Date: Wed, 18 Jun 2014 19:15:34 +0300 From: "Michael S. Tsirkin" Message-ID: <1403108034-32054-4-git-send-email-mst@redhat.com> References: <1403108034-32054-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1403108034-32054-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 003/106] 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: Luiz Capitulino , Peter Maydell , Peter Crosthwaite , Anthony Liguori , Igor Mammedov From: Igor Mammedov 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 Acked-by: Peter Crosthwaite Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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 be69c7f..9ce65fc 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) { -- MST