From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37880) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJPCq-0001Ov-GJ for qemu-devel@nongnu.org; Fri, 28 Feb 2014 10:18:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJPCh-0003yg-Ez for qemu-devel@nongnu.org; Fri, 28 Feb 2014 10:18:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJPCh-0003yO-77 for qemu-devel@nongnu.org; Fri, 28 Feb 2014 10:18:23 -0500 From: Stefan Hajnoczi Date: Fri, 28 Feb 2014 16:18:10 +0100 Message-Id: <1393600696-24118-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1393600696-24118-1-git-send-email-stefanha@redhat.com> References: <1393600696-24118-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v5 1/7] object: add object_get_canonical_basename() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Fam Zheng , Michael Roth , Igor Mammedov It is often useful to find an object's child property name. Also use this new function to simplify the implementation of object_get_canonical_path(). Signed-off-by: Stefan Hajnoczi --- include/qom/object.h | 8 ++++++++ qom/object.c | 53 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 9c7c361..8c6db7c 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -974,6 +974,14 @@ const char *object_property_get_type(Object *obj, const char *name, Object *object_get_root(void); /** + * object_get_canonical_basename: + * + * Returns: The final component in the object's canonical path. The canonical + * path is the path within the composition tree starting from the root. + */ +gchar *object_get_canonical_basename(Object *obj); + +/** * object_get_canonical_path: * * Returns: The canonical path for a object. This is the path within the diff --git a/qom/object.c b/qom/object.c index 660859c..0cdc319 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1102,39 +1102,48 @@ void object_property_add_link(Object *obj, const char *name, g_free(full_type); } +gchar *object_get_canonical_basename(Object *obj) +{ + ObjectProperty *prop = NULL; + + g_assert(obj->parent != NULL); + + QTAILQ_FOREACH(prop, &obj->parent->properties, node) { + if (!object_property_is_child(prop)) { + continue; + } + + if (prop->opaque == obj) { + return g_strdup(prop->name); + } + } + + /* obj had a parent but was not a child, should never happen */ + g_assert_not_reached(); + return NULL; +} + gchar *object_get_canonical_path(Object *obj) { Object *root = object_get_root(); - char *newpath = NULL, *path = NULL; + char *newpath, *path = NULL; while (obj != root) { - ObjectProperty *prop = NULL; - - g_assert(obj->parent != NULL); - - QTAILQ_FOREACH(prop, &obj->parent->properties, node) { - if (!object_property_is_child(prop)) { - continue; - } + char *component = object_get_canonical_basename(obj); - if (prop->opaque == obj) { - if (path) { - newpath = g_strdup_printf("%s/%s", prop->name, path); - g_free(path); - path = newpath; - } else { - path = g_strdup(prop->name); - } - break; - } + if (path) { + newpath = g_strdup_printf("%s/%s", component, path); + g_free(component); + g_free(path); + path = newpath; + } else { + path = component; } - g_assert(prop != NULL); - obj = obj->parent; } - newpath = g_strdup_printf("/%s", path); + newpath = g_strdup_printf("/%s", path ? path : ""); g_free(path); return newpath; -- 1.8.5.3