On 03/03/18 00:37, Eric Blake wrote:
> On 03/01/2018 07:09 AM, Alexey Kardashevskiy wrote:
>> ObjectPropertyInfo is more generic and only missing @description.
>> This adds a description to ObjectPropertyInfo and removes
>> DevicePropertyInfo so the resulting ObjectPropertyInfo can be used
>> elsewhere.
>>
>> Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru>
>> ---
>> qapi-schema.json | 23 +++++------------------
>> qdev-monitor.c | 6 +++---
>> qmp.c | 20 ++++++++++----------
>> 3 files changed, 18 insertions(+), 31 deletions(-)
>>
>> diff --git a/qapi-schema.json b/qapi-schema.json
>> index 0262b9f..87327e5 100644
>> --- a/qapi-schema.json
>> +++ b/qapi-schema.json
>> @@ -1266,10 +1266,12 @@
>> # 3) A link type in the form 'link<subtype>' where subtype is a
>> qdev
>> # device type name. Link properties form the device model
>> graph.
>> #
>> +# @description: if specified, the description of the property.
>
> Missing a '(since 2.12)' tag.
>
>> +#
>> # Since: 1.2
>> ##
>> { 'struct': 'ObjectPropertyInfo',
>> - 'data': { 'name': 'str', 'type': 'str' } }
>> + 'data': { 'name': 'str', 'type': 'str', '*description': 'str' } }
>> +++ b/qmp.c
>> @@ -463,12 +463,12 @@ ObjectTypeInfoList *qmp_qom_list_types(bool
>> has_implements,
>> *
>> * The caller must free the return value.
>> */
>> -static DevicePropertyInfo *make_device_property_info(ObjectClass *klass,
>> - const char *name,
>> - const char
>> *default_type,
>> - const char
>> *description)
>> +static ObjObjectPropertyInfoectPropertyInfo
>> *make_device_property_info(ObjectClass *klass,
>> + const char *name,
>> + const char *default_type,
>> + const char *description)
>
> Why the indentation change?
Oh. Leftover from DevicePropertyInfo->(non-existng) OOMPropertyInfo. I'll
repost.
>
>> @@ -508,14 +508,14 @@ static DevicePropertyInfo
>> *make_device_property_info(ObjectClass *klass,
>> return info;
>> }
>> -DevicePropertyInfoList *qmp_device_list_properties(const char *typename,
>> - Error **errp)
>> +ObjectPropertyInfoList *qmp_device_list_properties(const char *typename,
>> + Error **errp)
>
> and again
>
> Otherwise looks okay
>
--
Alexey
