On 06/28/2017 10:50 AM, Kevin Wolf wrote:
> Am 23.06.2017 um 14:46 hat Manos Pitsidianakis geschrieben:
>> This is needed to configure throttle filter driver nodes with QAPI.
>>
>> Signed-off-by: Manos Pitsidianakis <el13...@mail.ntua.gr>
>> ---
>> qapi/block-core.json | 19 ++++++++++++++++++-
>> 1 file changed, 18 insertions(+), 1 deletion(-)
>>
>> diff --git a/qapi/block-core.json b/qapi/block-core.json
>> index f85c2235c7..1d4afafe8c 100644
>> --- a/qapi/block-core.json
>> +++ b/qapi/block-core.json
>> @@ -2119,7 +2119,7 @@
>> 'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',
>> 'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',
>> 'quorum', 'raw', 'rbd', 'replication', 'sheepdog', 'ssh',
>> - 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
>> + 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
>>
>> ##
>> # @BlockdevOptionsFile:
>> @@ -2984,6 +2984,7 @@
>> 'replication':'BlockdevOptionsReplication',
>> 'sheepdog': 'BlockdevOptionsSheepdog',
>> 'ssh': 'BlockdevOptionsSsh',
>> + 'throttle': 'BlockdevOptionsThrottle',
>> 'vdi': 'BlockdevOptionsGenericFormat',
>> 'vhdx': 'BlockdevOptionsGenericFormat',
>> 'vmdk': 'BlockdevOptionsGenericCOWFormat',
>> @@ -3723,3 +3724,19 @@
>> 'data' : { 'parent': 'str',
>> '*child': 'str',
>> '*node': 'str' } }
>> +
>> +##
>> +# @BlockdevOptionsThrottle:
>> +#
>> +# Driver specific block device options for Throttle
>> +#
>> +# @throttling-group: the name of the throttling group to use
>> +#
>> +# @options: BlockIOThrottle options
>
> Missing #optional marker.
The marker is now auto-generated based solely on the '*options' below,
so we don't need a redundant thing here.
>
>> +# Since: 2.9
>> +##
>> +{ 'struct': 'BlockdevOptionsThrottle',
>> + 'data': { 'throttling-group': 'str',
>> + 'file' : 'BlockdevRef',
>> + '*options' : 'BlockIOThrottle'
>> + } }
>
> Didn't we intend to make 'throttling-group' optional, too?
>
> If we don't, then the question of anonymous ThrottleGroup objects is
> kind of moot (not completely because -drive isn't bound to the schema,
> but in that case we should just error out there too if it's missing).
>
> Kevin
>
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
