qmp: Include parent type on 'qom-list-types' output

Include name of parent type of each type on 'qom-list-types' output.

Without this, there's no way to figure out the parents of a given type
without making additional 'qom-list-types' queries.

In addition to the test case for the new feature, update the
abstract-interface test case to use the new field and avoid the
"qom-list-types implements=object" trick.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170707122215.8819-4-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2017-07-07 09:22:15 -03:00
parent 87467eae37
commit f86285c571
3 changed files with 82 additions and 11 deletions

View File

@ -3054,10 +3054,12 @@
# @abstract: the type is abstract and can't be directly instantiated. # @abstract: the type is abstract and can't be directly instantiated.
# Omitted if false. (since 2.10) # Omitted if false. (since 2.10)
# #
# @parent: Name of parent type, if any (since 2.10)
#
# Since: 1.1 # Since: 1.1
## ##
{ 'struct': 'ObjectTypeInfo', { 'struct': 'ObjectTypeInfo',
'data': { 'name': 'str', '*abstract': 'bool' } } 'data': { 'name': 'str', '*abstract': 'bool', '*parent': 'str' } }
## ##
# @qom-list-types: # @qom-list-types:

5
qmp.c
View File

@ -430,10 +430,15 @@ static void qom_list_types_tramp(ObjectClass *klass, void *data)
{ {
ObjectTypeInfoList *e, **pret = data; ObjectTypeInfoList *e, **pret = data;
ObjectTypeInfo *info; ObjectTypeInfo *info;
ObjectClass *parent = object_class_get_parent(klass);
info = g_malloc0(sizeof(*info)); info = g_malloc0(sizeof(*info));
info->name = g_strdup(object_class_get_name(klass)); info->name = g_strdup(object_class_get_name(klass));
info->has_abstract = info->abstract = object_class_is_abstract(klass); info->has_abstract = info->abstract = object_class_is_abstract(klass);
if (parent) {
info->has_parent = true;
info->parent = g_strdup(object_class_get_name(parent));
}
e = g_malloc0(sizeof(*e)); e = g_malloc0(sizeof(*e));
e->value = info; e->value = info;

View File

@ -45,6 +45,40 @@ static QList *qom_list_types(const char *implements, bool abstract)
return ret; return ret;
} }
/* Build a name -> ObjectTypeInfo index from a ObjectTypeInfo list */
static QDict *qom_type_index(QList *types)
{
QDict *index = qdict_new();
QListEntry *e;
QLIST_FOREACH_ENTRY(types, e) {
QDict *d = qobject_to_qdict(qlist_entry_obj(e));
const char *name = qdict_get_str(d, "name");
QINCREF(d);
qdict_put(index, name, d);
}
return index;
}
/* Check if @parent is present in the parent chain of @type */
static bool qom_has_parent(QDict *index, const char *type, const char *parent)
{
while (type) {
QDict *d = qdict_get_qdict(index, type);
const char *p = d && qdict_haskey(d, "parent") ?
qdict_get_str(d, "parent") :
NULL;
if (!strcmp(type, parent)) {
return true;
}
type = p;
}
return false;
}
/* Find an entry on a list returned by qom-list-types */ /* Find an entry on a list returned by qom-list-types */
static QDict *type_list_find(QList *types, const char *name) static QDict *type_list_find(QList *types, const char *name)
{ {
@ -103,6 +137,30 @@ static void test_device_intro_list(void)
qtest_end(); qtest_end();
} }
/*
* Ensure all entries returned by qom-list-types implements=<parent>
* have <parent> as a parent.
*/
static void test_qom_list_parents(const char *parent)
{
QList *types;
QListEntry *e;
QDict *index;
types = qom_list_types(parent, true);
index = qom_type_index(types);
QLIST_FOREACH_ENTRY(types, e) {
QDict *d = qobject_to_qdict(qlist_entry_obj(e));
const char *name = qdict_get_str(d, "name");
g_assert(qom_has_parent(index, name, parent));
}
QDECREF(types);
QDECREF(index);
}
static void test_qom_list_fields(void) static void test_qom_list_fields(void)
{ {
QList *all_types; QList *all_types;
@ -125,6 +183,10 @@ static void test_qom_list_fields(void)
g_assert(abstract == expected_abstract); g_assert(abstract == expected_abstract);
} }
test_qom_list_parents("object");
test_qom_list_parents("device");
test_qom_list_parents("sys-bus-device");
QDECREF(all_types); QDECREF(all_types);
QDECREF(non_abstract); QDECREF(non_abstract);
qtest_end(); qtest_end();
@ -167,23 +229,25 @@ static void test_device_intro_concrete(void)
static void test_abstract_interfaces(void) static void test_abstract_interfaces(void)
{ {
QList *all_types; QList *all_types;
QList *obj_types;
QListEntry *e; QListEntry *e;
QDict *index;
qtest_start(common_args); qtest_start(common_args);
/*
* qom-list-types implements=interface returns all types that
* implement _any_ interface (not just interface types), but
* we can filter them out because interfaces don't implement
* the "object" type.
*/
all_types = qom_list_types("interface", true); all_types = qom_list_types("interface", true);
obj_types = qom_list_types("object", true); index = qom_type_index(all_types);
QLIST_FOREACH_ENTRY(all_types, e) { QLIST_FOREACH_ENTRY(all_types, e) {
QDict *d = qobject_to_qdict(qlist_entry_obj(e)); QDict *d = qobject_to_qdict(qlist_entry_obj(e));
const char *name = qdict_get_str(d, "name");
if (type_list_find(obj_types, qdict_get_str(d, "name"))) { /*
* qom-list-types implements=interface returns all types
* that implement _any_ interface (not just interface
* types), so skip the ones that don't have "interface"
* on the parent type chain.
*/
if (!qom_has_parent(index, name, "interface")) {
/* Not an interface type */ /* Not an interface type */
continue; continue;
} }
@ -192,7 +256,7 @@ static void test_abstract_interfaces(void)
} }
QDECREF(all_types); QDECREF(all_types);
QDECREF(obj_types); QDECREF(index);
qtest_end(); qtest_end();
} }