Re: [Qemu-devel] [PATCH v3 12/12] vl: drop display_type variable

[Eric Blake]

On 02/02/2018 05:10 AM, Gerd Hoffmann wrote:
> Switch over all leftover users to qapi DisplayType.
> Then delete the unused display_type variable.
> 
> Add 'default' DisplayType, which isn't an actual display type but
> a placeholder for "user didn't specify a display".  It will be replaced
> by the DisplayType actually used, which in turn depends on the
> DisplayTypes availabel in the particular build.

s/availabel/available/

> 
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
>  vl.c         | 54 ++++++++++++++----------------------------------------
>  qapi/ui.json |  5 +++--
>  2 files changed, 17 insertions(+), 42 deletions(-)
> 

> +++ b/qapi/ui.json
> @@ -1017,7 +1017,7 @@
>  #
>  ##
>  { 'enum'    : 'DisplayType',
> -  'data'    : [ 'none', 'gtk', 'sdl',
> +  'data'    : [ 'default', 'none', 'gtk', 'sdl',
>                  'egl-headless', 'curses', 'cocoa' ] }

Worth documenting that the 'default' value is special and will be
converted to one of the other types, based on compile-time availability?

>  
>  ##
> @@ -1039,7 +1039,8 @@
>                  '*window-close'  : 'bool',
>                  '*gl'            : 'bool' },
>    'discriminator' : 'type',
> -  'data'    : { 'none'           : 'DisplayNoOpts',
> +  'data'    : { 'default'        : 'DisplayNoOpts',
> +                'none'           : 'DisplayNoOpts',
>                  'gtk'            : 'DisplayGTK',
>                  'sdl'            : 'DisplayNoOpts',
>                  'egl-headless'   : 'DisplayNoOpts',
> 

Reviewed-by: Eric Blake <address@hidden>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

signature.asc
Description: OpenPGP digital signature