Re: [Qemu-devel] [PATCH v2 09/10] monitor: add query-vnc2 command

[Eric Blake <eblake@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1478 bytes --]

On 12/15/2014 02:16 AM, Gerd Hoffmann wrote:
>   Hi,
> 
>>> > > 
>>> > > So better add a 'vencrypt-subauth' enum with this list?
>> > 
>> > Yeah probably a good idea
> How does this look like (incremental fixup attached, docs to be
> updated) ?
> 

> +++ b/qapi-schema.json
> @@ -785,12 +785,22 @@
>  #
>  # Since: 2.3
>  ##
> +{ 'enum': 'VncPriAuth',
> +  'data': [ 'none', 'vnc', 'ra2', 'ra2ne', 'tight', 'ultra',
> +            'tls', 'vencrypt', 'sasl' ] }
> +{ 'enum': 'VncVencryptSubAuth',
> +  'data': [ 'plain',
> +            'tls-none',  'x509-none',
> +            'tls-vnc',   'x509-vnc',
> +            'tls-plain', 'x509-plain',
> +            'tls-sasl',  'x509-sasl' ] }

Might be worth separate docs for the enums (we've done it elsewhere).

>  { 'type': 'VncInfo2',
> -  'data': { 'id'       : 'str',
> -            'server'   : ['VncBasicInfo'],
> -            'clients'  : ['VncClientInfo'],
> -            'auth'     : 'str',
> -            '*display' : 'str' } }
> +  'data': { 'id'        : 'str',
> +            'server'    : ['VncBasicInfo'],
> +            'clients'   : ['VncClientInfo'],
> +            'auth'      : 'VncPriAuth',
> +            '*vencrypt' : 'VncVencryptSubAuth',
> +            '*display'  : 'str' } }

And don't forget docs for 'vencrypt'.  But the interface looks fine to me.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 539 bytes --]