[libvirt] [PATCH 4/7] conf: re-situate <bandwidth> element in <interface>

Michal Privoznik mprivozn at redhat.com
Mon Feb 24 16:46:02 UTC 2014


On 21.02.2014 14:58, Laine Stump wrote:
> This moves the call to virNetDevBandwidthFormat() in
> virDomainNetDefFormat() to be called right after the call to
> virNetDevVPortProfileFormat(), so that a single chunk of that function
> can be placed inside an if that conditionally calls
> virDomainActualNetDefContentsFormat() instead (next patch). The
> re-ordering necessitates modifying a couple of test data files.
> ---
>   src/conf/domain_conf.c                                              | 6 +++---
>   .../qemuhotplug-console-compat-2+console-virtio.xml                 | 4 ++--
>   tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml            | 4 ++--
>   tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml               | 2 +-
>   4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index b5b70cd..67fc372 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -15599,6 +15599,9 @@ virDomainNetDefFormat(virBufferPtr buf,
>           return -1;
>       if (virNetDevVPortProfileFormat(def->virtPortProfile, buf) < 0)
>           return -1;
> +    if (virNetDevBandwidthFormat(def->bandwidth, buf) < 0)
> +        return -1;
> +
>       virBufferEscapeString(buf, "<script path='%s'/>\n",
>                             def->script);
>       if (def->ifname &&
> @@ -15651,9 +15654,6 @@ virDomainNetDefFormat(virBufferPtr buf,
>                             virDomainNetInterfaceLinkStateTypeToString(def->linkstate));
>       }
>
> -    if (virNetDevBandwidthFormat(def->bandwidth, buf) < 0)
> -        return -1;
> -
>       virBufferAdjustIndent(buf, -6);
>
>       if (virDomainDeviceInfoFormat(buf, &def->info,
> diff --git a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml b/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml
> index a484e82..25fc120 100644
> --- a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml
> +++ b/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml
> @@ -59,12 +59,12 @@
>       <interface type='network'>
>         <mac address='52:54:00:ea:35:6f'/>
>         <source network='default'/>
> -      <target dev='vnet0'/>
> -      <model type='virtio'/>
>         <bandwidth>
>           <inbound average='4000' peak='8000' floor='200' burst='1024'/>
>           <outbound average='4000' peak='8000' burst='1024'/>
>         </bandwidth>
> +      <target dev='vnet0'/>
> +      <model type='virtio'/>
>         <alias name='net0'/>
>         <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
>       </interface>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
> index 065ef2d..e5c45a3 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
> @@ -59,12 +59,12 @@
>       <interface type='network'>
>         <mac address='52:54:00:ea:35:6f'/>
>         <source network='default'/>
> -      <target dev='vnet0'/>
> -      <model type='virtio'/>
>         <bandwidth>
>           <inbound average='4000' peak='8000' floor='200' burst='1024'/>
>           <outbound average='4000' peak='8000' burst='1024'/>
>         </bandwidth>
> +      <target dev='vnet0'/>
> +      <model type='virtio'/>
>         <alias name='net0'/>
>         <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
>       </interface>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml
> index 064a05f..f70e20a 100644
> --- a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml
> @@ -45,11 +45,11 @@
>       <interface type='network'>
>         <mac address='52:54:00:24:a5:9f'/>
>         <source network='default'/>
> -      <model type='rtl8139'/>
>         <bandwidth>
>           <inbound average='1000' peak='4000' burst='1024'/>
>           <outbound average='128' peak='256' burst='32768'/>
>         </bandwidth>
> +      <model type='rtl8139'/>
>         <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
>       </interface>
>       <serial type='pty'>
>


Yup. since there can be only one <bandwidth/> sub-element right now, the 
ordering should not matter.

ACK

Michal




More information about the libvir-list mailing list