@@ -995,6 +995,20 @@ void object_property_iter_init(ObjectPropertyIterator *iter,
Object *obj);
/**
+ * object_class_property_iter_init:
+ * @klass: the class
+ *
+ * Initializes an iterator for traversing all properties
+ * registered against an object class and all parent classes.
+ *
+ * It is forbidden to modify the property list while iterating,
+ * whether removing or adding properties.
+ */
+void object_class_property_iter_init(ObjectPropertyIterator *iter,
+ ObjectClass *klass);
+
+
+/**
* object_property_iter_next:
* @iter: the iterator instance
*
@@ -1010,6 +1010,14 @@ void object_property_iter_init(ObjectPropertyIterator *iter,
iter->nextclass = object_get_class(obj);
}
+
+void object_class_property_iter_init(ObjectPropertyIterator *iter,
+ ObjectClass *klass)
+{
+ g_hash_table_iter_init(&iter->iter, klass->properties);
+ iter->nextclass = object_class_get_parent(klass);
+}
+
ObjectProperty *object_property_iter_next(ObjectPropertyIterator *iter)
{
gpointer key, val;
@@ -1017,8 +1025,7 @@ ObjectProperty *object_property_iter_next(ObjectPropertyIterator *iter)
if (!iter->nextclass) {
return NULL;
}
- g_hash_table_iter_init(&iter->iter, iter->nextclass->properties);
- iter->nextclass = object_class_get_parent(iter->nextclass);
+ object_class_property_iter_init(iter, iter->nextclass);
}
return val;
}
@@ -496,6 +496,33 @@ static void test_dummy_iterator(void)
}
+static void test_dummy_class_iterator(void)
+{
+ ObjectClass *klass = object_class_by_name(TYPE_DUMMY);
+ ObjectProperty *prop;
+ ObjectPropertyIterator iter;
+ bool seensv = false, seenav = false, seentype;
+
+ object_class_property_iter_init(&iter, klass);
+ while ((prop = object_property_iter_next(&iter))) {
+ if (g_str_equal(prop->name, "sv")) {
+ seensv = true;
+ } else if (g_str_equal(prop->name, "av")) {
+ seenav = true;
+ } else if (g_str_equal(prop->name, "type")) {
+ /* This prop comes from the base Object class */
+ seentype = true;
+ } else {
+ g_printerr("Found prop '%s'\n", prop->name);
+ g_assert_not_reached();
+ }
+ }
+ g_assert(seenav);
+ g_assert(seensv);
+ g_assert(seentype);
+}
+
+
static void test_dummy_delchild(void)
{
Object *parent = object_get_objects_root();
@@ -524,6 +551,7 @@ int main(int argc, char **argv)
g_test_add_func("/qom/proplist/badenum", test_dummy_badenum);
g_test_add_func("/qom/proplist/getenum", test_dummy_getenum);
g_test_add_func("/qom/proplist/iterator", test_dummy_iterator);
+ g_test_add_func("/qom/proplist/class_iterator", test_dummy_class_iterator);
g_test_add_func("/qom/proplist/delchild", test_dummy_delchild);
return g_test_run();
The new function will allow us to iterate over class properties using the same logic we use for object properties. Unit test included. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- include/qom/object.h | 14 ++++++++++++++ qom/object.c | 11 +++++++++-- tests/check-qom-proplist.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-)