Move description and default_value population from the individual QMP handlers into qom_property_info(), so all callers get them.
This also adds description and default-value to qom-list responses, which previously only returned name and type. The handler doesn't care. Signed-off-by: Marc-André Lureau <[email protected]> --- qom/qom-qmp-cmds.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index f9e6d4371cc5..782a9af14de5 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -35,6 +35,8 @@ static ObjectPropertyInfo *qom_property_info(ObjectProperty *prop) info->name = g_strdup(prop->name); info->type = g_strdup(prop->type); + info->description = g_strdup(prop->description); + info->default_value = qobject_ref(prop->defval); if (prop->qapi_type) { info->qapi_type = g_strdup(prop->qapi_type->masked_name); } @@ -218,8 +220,6 @@ ObjectPropertyInfoList *qmp_device_list_properties(const char *typename, object_property_iter_init(&iter, obj); while ((prop = object_property_iter_next(&iter))) { - ObjectPropertyInfo *info; - /* Skip Object and DeviceState properties */ if (strcmp(prop->name, "type") == 0 || strcmp(prop->name, "realized") == 0 || @@ -229,11 +229,7 @@ ObjectPropertyInfoList *qmp_device_list_properties(const char *typename, continue; } - info = qom_property_info(prop); - info->description = g_strdup(prop->description); - info->default_value = qobject_ref(prop->defval); - - QAPI_LIST_PREPEND(prop_list, info); + QAPI_LIST_PREPEND(prop_list, qom_property_info(prop)); } object_unref(obj); @@ -270,12 +266,7 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename, object_property_iter_init(&iter, obj); } while ((prop = object_property_iter_next(&iter))) { - ObjectPropertyInfo *info = qom_property_info(prop); - - info->description = g_strdup(prop->description); - info->default_value = qobject_ref(prop->defval); - - QAPI_LIST_PREPEND(prop_list, info); + QAPI_LIST_PREPEND(prop_list, qom_property_info(prop)); } object_unref(obj); -- 2.55.0.543.g5ebe2ebe4ea8
