From patchwork Wed Mar 26 10:36:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 333924 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 4D81314008D for ; Thu, 27 Mar 2014 00:59:19 +1100 (EST) Received: from localhost ([::1]:46903 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSlkp-0003IH-7t for incoming@patchwork.ozlabs.org; Wed, 26 Mar 2014 07:12:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSlhw-00018O-1x for qemu-devel@nongnu.org; Wed, 26 Mar 2014 07:09:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSlhl-0002cQ-M1 for qemu-devel@nongnu.org; Wed, 26 Mar 2014 07:09:18 -0400 Received: from [59.151.112.132] (port=38742 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSlhl-0002SW-7a for qemu-devel@nongnu.org; Wed, 26 Mar 2014 07:09:09 -0400 X-IronPort-AV: E=Sophos;i="4.97,734,1389715200"; d="scan'208";a="28487318" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 Mar 2014 18:34:31 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s2QAapvu003096; Wed, 26 Mar 2014 18:36:52 +0800 Received: from G08CNEXMBPEKD03.g08.fujitsu.local ([10.167.33.86]) by G08CNEXCHPEKD01.g08.fujitsu.local ([10.167.33.80]) with mapi id 14.03.0146.002; Wed, 26 Mar 2014 18:37:04 +0800 From: "hutao@cn.fujitsu.com" To: "qemu-devel@nongnu.org" Thread-Topic: [PATCH v3 10/34] qmp: allow object-add completion handler to get canonical path Thread-Index: AQHPSN9TA/AKX7o3akmFviSEzHMW5w== Date: Wed, 26 Mar 2014 10:36:59 +0000 Message-ID: <2c29c40a976ad2f7c715c39115a3829344a45e33.1395825870.git.hutao@cn.fujitsu.com> References: In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.167.226.102] MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: "ehabkost@redhat.com" , "imammedo@redhat.com" , "mtosatti@redhat.com" , Paolo Bonzini , "a.motakis@virtualopensystems.com" , "gaowanlong@cn.fujitsu.com" Subject: [Qemu-devel] [PATCH v3 10/34] qmp: allow object-add 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 Signed-off-by: Paolo Bonzini --- qmp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qmp.c b/qmp.c index 87a28f7..54b95ba 100644 --- a/qmp.c +++ b/qmp.c @@ -564,13 +564,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);