[libvirt PATCH] network: Use single quotes in default network configuration

[Daniel P. Berrangé]

On Tue, Aug 04, 2020 at 02:30:07PM +0200, Andrea Bolognani wrote:
> Whenever libvirt is upgraded on a Debian system, the user will be
> prompted along the lines of
> 
>   Configuration file '/etc/libvirt/qemu/networks/default.xml'
>    ==> Modified (by you or by a script) since installation.
>    ==> Package distributor has shipped an updated version.
>      What would you like to do about it ?  Your options are:
>       Y or I  : install the package maintainer's version
>       N or O  : keep your currently-installed version
>         D     : show the differences between the versions
>         Z     : start a shell to examine the situation
>    The default action is to keep your current version.
>   *** default.xml (Y/I/N/O/D/Z) [default=N] ? d
>   --- /etc/libvirt/qemu/networks/default.xml      2020-08-04 12:57:25.450911143 +0200
>   +++ /etc/libvirt/qemu/networks/default.xml.dpkg-new     2020-08-03 22:47:15.000000000 +0200
>   @@ -1,19 +1,11 @@
>   -<!--
>   -WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
>   -OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
>   -  virsh net-edit default
>   -or other application using the libvirt API.
>   --->
>   -
>    <network>
>      <name>default</name>
>   -  <uuid>612a2cab-72fb-416d-92bc-4d9e597bfb63</uuid>
>   -  <forward mode='nat'/>
>   -  <bridge name='virbr0' stp='on' delay='0'/>
>   -  <mac address='52:54:00:1f:03:79'/>
>   -  <ip address='192.168.122.1' netmask='255.255.255.0'>
>   +  <uuid>d020b839-4379-492c-aa74-eab7365076e6</uuid>
>   +  <bridge name="virbr0"/>
>   +  <forward/>
>   +  <ip address="192.168.122.1" netmask="255.255.255.0">
>        <dhcp>
>   -      <range start='192.168.122.2' end='192.168.122.254'/>
>   +      <range start="192.168.122.2" end="192.168.122.254"/>
>        </dhcp>
>      </ip>
>    </network>
> 
> The UUID situation should probably be handled the same way it is
> in the spec file by stripping it, and in general we could behave
> much better towards users, but one part of the diff that
> immediately stands out is that some lines are highlighted not
> because they are semantically different, but simply because they
> use different types of quotes around attributes.
> 
> Since the canonical version of all libvirt XML documents (as
> returned by the various vir*GetXMLDesc() APIs) as well as the
> on-disk representations use single quotes, let's use the same
> for configuration files we install as well.
> 
> Signed-off-by: Andrea Bolognani <abologna at redhat.com>
> ---
>  src/network/default.xml.in | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/network/default.xml.in b/src/network/default.xml.in
> index d7241d0c16..08a3632eb6 100644
> --- a/src/network/default.xml.in
> +++ b/src/network/default.xml.in
> @@ -1,10 +1,10 @@
>  <network>
>    <name>default</name>
> -  <bridge name="virbr0"/>
> +  <bridge name='virbr0'/>
>    <forward/>
> -  <ip address="192.168.122.1" netmask="255.255.255.0">
> +  <ip address='192.168.122.1' netmask='255.255.255.0'>
>      <dhcp>
> -      <range start="192.168.122.2" end="192.168.122.254"/>
> +      <range start='192.168.122.2' end='192.168.122.254'/>
>      </dhcp>
>    </ip>
>  </network>

Reviewed-by: Daniel P. Berrangé <berrange at redhat.com>


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 :|