From patchwork Tue Mar 4 07:28:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 326199 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9F37E2C00C6 for ; Tue, 4 Mar 2014 20:28:37 +1100 (EST) Received: from localhost ([::1]:43553 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKjrE-0000wD-Ds for incoming@patchwork.ozlabs.org; Tue, 04 Mar 2014 02:33:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKjoF-0008Kp-65 for qemu-devel@nongnu.org; Tue, 04 Mar 2014 02:30:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKjo8-0004bz-AP for qemu-devel@nongnu.org; Tue, 04 Mar 2014 02:30:38 -0500 Received: from [222.73.24.84] (port=42033 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKjo7-0004Yf-Bi for qemu-devel@nongnu.org; Tue, 04 Mar 2014 02:30:32 -0500 X-IronPort-AV: E=Sophos;i="4.97,583,1389715200"; d="scan'208";a="9641990" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 04 Mar 2014 15:26:25 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s247UBde004052; Tue, 4 Mar 2014 15:30:11 +0800 Received: from G08FNSTD100614.fnst.cn.fujitsu.com ([10.167.226.102]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2014030415274009-372184 ; Tue, 4 Mar 2014 15:27:40 +0800 From: Hu Tao To: qemu-devel@nongnu.org Date: Tue, 4 Mar 2014 15:28:15 +0800 Message-Id: <9f8583e35968e179edb987c34e0d278bff930c3b.1393917248.git.hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.8.5.2.229.g4448466 In-Reply-To: References: X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/04 15:27:40, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/04 15:27:44, Serialize complete at 2014/03/04 15:27:44 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: pbonzini@redhat.com, gaowanlong@cn.fujitsu.com, imammedo@redhat.com Subject: [Qemu-devel] [PATCH v19 01/11] object_add: allow completion handler to get canonical path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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) {