From patchwork Wed May 27 18:20:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 477229 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 918BB140129 for ; Thu, 28 May 2015 04:23:31 +1000 (AEST) Received: from localhost ([::1]:55084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxfzF-0001Ta-FQ for incoming@patchwork.ozlabs.org; Wed, 27 May 2015 14:23:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxfwR-0004PQ-Gg for qemu-devel@nongnu.org; Wed, 27 May 2015 14:20:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxfwN-0002ch-B9 for qemu-devel@nongnu.org; Wed, 27 May 2015 14:20:35 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47643 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxfwN-0002cW-07 for qemu-devel@nongnu.org; Wed, 27 May 2015 14:20:31 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8550CACEF; Wed, 27 May 2015 18:20:30 +0000 (UTC) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 27 May 2015 20:20:19 +0200 Message-Id: <1432750824-27702-9-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432750824-27702-1-git-send-email-afaerber@suse.de> References: <1432750824-27702-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 Cc: Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Eduardo Habkost Subject: [Qemu-devel] [PULL v2 08/12] qom: Add helper method for getting user objects root 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: "Daniel P. Berrange" Add object_get_objects_root() method which is a convience for obtaining the Object * located at /objects in the object composition tree. Convert existing code over to use the new API where appropriate. Signed-off-by: Daniel P. Berrange Signed-off-by: Andreas Färber --- include/qom/object.h | 12 ++++++++++++ iothread.c | 4 +--- numa.c | 2 +- qmp.c | 6 +++--- qom/object.c | 5 +++++ 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index d2d7748..d30c68c 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1026,6 +1026,18 @@ const char *object_property_get_type(Object *obj, const char *name, */ Object *object_get_root(void); + +/** + * object_get_objects_root: + * + * Get the container object that holds user created + * object instances. This is the object at path + * "/objects" + * + * Returns: the user object container + */ +Object *object_get_objects_root(void); + /** * object_get_canonical_path_component: * diff --git a/iothread.c b/iothread.c index 0416fc4..98dcdf9 100644 --- a/iothread.c +++ b/iothread.c @@ -19,8 +19,6 @@ #include "qmp-commands.h" #include "qemu/error-report.h" -#define IOTHREADS_PATH "/objects" - typedef ObjectClass IOThreadClass; #define IOTHREAD_GET_CLASS(obj) \ @@ -153,7 +151,7 @@ IOThreadInfoList *qmp_query_iothreads(Error **errp) { IOThreadInfoList *head = NULL; IOThreadInfoList **prev = &head; - Object *container = container_get(object_get_root(), IOTHREADS_PATH); + Object *container = object_get_objects_root(); object_child_foreach(container, query_one_iothread, &prev); return head; diff --git a/numa.c b/numa.c index c975fb2..b14a5c1 100644 --- a/numa.c +++ b/numa.c @@ -486,7 +486,7 @@ MemdevList *qmp_query_memdev(Error **errp) Object *obj; MemdevList *list = NULL; - obj = object_resolve_path("/objects", NULL); + obj = object_get_objects_root(); if (obj == NULL) { return NULL; } diff --git a/qmp.c b/qmp.c index 3f5dfe3..fa013e3 100644 --- a/qmp.c +++ b/qmp.c @@ -651,7 +651,7 @@ void object_add(const char *type, const char *id, const QDict *qdict, } } - object_property_add_child(container_get(object_get_root(), "/objects"), + object_property_add_child(object_get_objects_root(), id, obj, &local_err); if (local_err) { goto out; @@ -659,7 +659,7 @@ void object_add(const char *type, const char *id, const QDict *qdict, user_creatable_complete(obj, &local_err); if (local_err) { - object_property_del(container_get(object_get_root(), "/objects"), + object_property_del(object_get_objects_root(), id, &error_abort); goto out; } @@ -706,7 +706,7 @@ void qmp_object_del(const char *id, Error **errp) Object *container; Object *obj; - container = container_get(object_get_root(), "/objects"); + container = object_get_objects_root(); obj = object_resolve_path_component(container, id); if (!obj) { error_setg(errp, "object id not found"); diff --git a/qom/object.c b/qom/object.c index 550dd48..63bd300 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1054,6 +1054,11 @@ Object *object_get_root(void) return root; } +Object *object_get_objects_root(void) +{ + return container_get(object_get_root(), "/objects"); +} + static void object_get_child_property(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) {