[RFCv2 37/46] conf: Replace virDomainGraphicsDefParseXMLSpice(hardcoded) with virDomainGraphicsSpiceDefParseXML(generated)

Daniel P. Berrangé berrange at redhat.com
Fri Dec 4 18:17:22 UTC 2020


On Fri, Sep 04, 2020 at 11:35:29AM +0800, Shi Lei wrote:
> Signed-off-by: Shi Lei <shi_lei at massclouds.com>
> ---
>  src/conf/domain_conf.c | 272 ++---------------------------------------
>  src/conf/domain_conf.h |  37 +++---
>  2 files changed, 26 insertions(+), 283 deletions(-)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index b3ec111..20d731b 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -877,6 +877,7 @@ VIR_ENUM_IMPL(virDomainGraphicsVNCSharePolicy,
>  
>  VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelName,
>                VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST,
> +              "none",
>                "main",
>                "display",
>                "inputs",
> @@ -14431,13 +14432,14 @@ virDomainGraphicsRDPDefParseXMLHook(xmlNodePtr node
> diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
> index df84763..f27f429 100644
> --- a/src/conf/domain_conf.h
> +++ b/src/conf/domain_conf.h
> @@ -1584,6 +1584,7 @@ struct _virDomainGraphicsAuthDef {  /* genparse, genformat:separate */
>  };
>  
>  typedef enum {
> +    VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_NONE = 0,

I'm not sure why this extra enum field needs to be added ?

IMHO we don't really want to have such extra values except in
a few special cases where we need to track some "default"
explicitly.

>      VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MAIN,
>      VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_DISPLAY,
>      VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_INPUT,


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|




More information about the libvir-list mailing list