From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z602B-0001Yy-Jn for qemu-devel@nongnu.org; Fri, 19 Jun 2015 13:24:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z6027-0000d3-3g for qemu-devel@nongnu.org; Fri, 19 Jun 2015 13:24:55 -0400 Received: from cantor2.suse.de ([195.135.220.15]:58994 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z6026-0000cC-PY for qemu-devel@nongnu.org; Fri, 19 Jun 2015 13:24:51 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 19 Jun 2015 19:24:41 +0200 Message-Id: <1434734687-5578-9-git-send-email-afaerber@suse.de> In-Reply-To: <1434734687-5578-1-git-send-email-afaerber@suse.de> References: <1434734687-5578-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v3 08/14] qom: Add helper function for getting user objects root List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Eduardo Habkost From: "Daniel P. Berrange" Add object_get_objects_root() function which is a convenience 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 Reviewed-by: Eric Blake Signed-off-by: Andreas F=C3=A4rber --- 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 0505f20..b03ede0 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); =20 + +/** + * 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 878a594..6d2a33f 100644 --- a/iothread.c +++ b/iothread.c @@ -19,8 +19,6 @@ #include "qmp-commands.h" #include "qemu/error-report.h" =20 -#define IOTHREADS_PATH "/objects" - typedef ObjectClass IOThreadClass; =20 #define IOTHREAD_GET_CLASS(obj) \ @@ -160,7 +158,7 @@ IOThreadInfoList *qmp_query_iothreads(Error **errp) { IOThreadInfoList *head =3D NULL; IOThreadInfoList **prev =3D &head; - Object *container =3D container_get(object_get_root(), IOTHREADS_PAT= H); + Object *container =3D object_get_objects_root(); =20 object_child_foreach(container, query_one_iothread, &prev); return head; diff --git a/numa.c b/numa.c index d227ccc..e67322a 100644 --- a/numa.c +++ b/numa.c @@ -485,7 +485,7 @@ MemdevList *qmp_query_memdev(Error **errp) Object *obj; MemdevList *list =3D NULL; =20 - obj =3D object_resolve_path("/objects", NULL); + obj =3D object_get_objects_root(); if (obj =3D=3D 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, con= st QDict *qdict, } } =20 - 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, con= st QDict *qdict, =20 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; =20 - container =3D container_get(object_get_root(), "/objects"); + container =3D object_get_objects_root(); obj =3D 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 d142d15..69b7077 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1054,6 +1054,11 @@ Object *object_get_root(void) return root; } =20 +Object *object_get_objects_root(void) +{ + return container_get(object_get_root(), "/objects"); +} + static void object_get_child_property(Object *obj, Visitor *v, void *opa= que, const char *name, Error **errp) { --=20 2.1.4