[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 1/7] object: add object_get_canonical_basename()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v5 1/7] object: add object_get_canonical_basename() |
Date: |
Fri, 28 Feb 2014 16:18:10 +0100 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH v5 0/7] dataplane: switch to N:M devices-per-thread model, Stefan Hajnoczi, 2014/02/28
- [Qemu-devel] [PATCH v5 1/7] object: add object_get_canonical_basename(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v5 2/7] rfifolock: add recursive FIFO lock, Stefan Hajnoczi, 2014/02/28
- [Qemu-devel] [PATCH v5 3/7] aio: add aio_context_acquire() and aio_context_release(), Stefan Hajnoczi, 2014/02/28
- [Qemu-devel] [PATCH v5 4/7] iothread: add I/O thread object, Stefan Hajnoczi, 2014/02/28
- [Qemu-devel] [PATCH v5 5/7] qdev: make get_pointer() handle temporary strings, Stefan Hajnoczi, 2014/02/28
- [Qemu-devel] [PATCH v5 6/7] iothread: add "iothread" qdev property type, Stefan Hajnoczi, 2014/02/28
- [Qemu-devel] [PATCH v5 7/7] dataplane: replace internal thread with IOThread, Stefan Hajnoczi, 2014/02/28