[libvirt PATCH 21/23] conf: remove use of the terms 'master' and 'slave' in mndm config

Peter Krempa pkrempa at redhat.com
Fri Jun 19 10:44:42 UTC 2020


On Fri, Jun 19, 2020 at 10:32:58 +0100, Daniel Berrange wrote:
> We can't change the attribute names in the public XML schema
> without breaking back compat, so the best we can do is replace
> the terms in our internal structs.
> 
> Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
> ---
>  src/bhyve/bhyve_driver.c        |  2 +-
>  src/bhyve/bhyve_parse_command.c | 20 ++++++++++----------
>  src/conf/domain_conf.c          | 24 ++++++++++++------------
>  src/conf/domain_conf.h          |  4 ++--
>  src/util/virnetdevtap.c         |  2 +-
>  src/vbox/vbox_common.c          |  4 ++--
>  6 files changed, 28 insertions(+), 28 deletions(-)

[...]

> diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
> index 41715c75f2..00a0e02cd1 100644
> --- a/src/conf/domain_conf.h
> +++ b/src/conf/domain_conf.h
> @@ -1201,8 +1201,8 @@ struct _virDomainChrSourceDef {
>              int append; /* enum virTristateSwitch */
>          } file; /* pty, file, pipe, or device */
>          struct {
> -            char *master;
> -            char *slave;
> +            char *primary;
> +            char *secondary;
>          } nmdm;

I'm not persuaded that it's worth diverging the internal names from the
XML names since we have to stick with those.

NACK




More information about the libvir-list mailing list