[libvirt PATCH 1/5] qemu: fail on attempt to set 'floor' if interface type is not 'network'

[Pavel Hrdina]

On Wed, Feb 12, 2020 at 09:21:05AM +0100, Michal Privoznik wrote:
> On 2/10/20 5:10 PM, Pavel Mores wrote:
> > QoS 'floor' setting is documented to be only supported for interfaces of
> > type 'network'.  Fail with an error message on attempt to set 'floor' on
> > an interface of any other type.
> > 
> > Signed-off-by: Pavel Mores <pmores at redhat.com>
> > ---
> >   src/qemu/qemu_driver.c | 13 ++++++++++---
> >   1 file changed, 10 insertions(+), 3 deletions(-)
> > 
> > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> > index e69d083836..88fa56da42 100644
> > --- a/src/qemu/qemu_driver.c
> > +++ b/src/qemu/qemu_driver.c
> > @@ -11672,9 +11672,16 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
> >                      sizeof(*newBandwidth->out));
> >           }
> > -        if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK &&
> > -            virDomainNetBandwidthUpdate(net, newBandwidth) < 0)
> > -            goto endjob;
> > +        if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
> > +            if (virDomainNetBandwidthUpdate(net, newBandwidth) < 0)
> > +                goto endjob;
> > +        } else {
> > +            if (bandwidth->in && bandwidth->in->floor != 0) {
> > +                virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
> > +                               _("'floor' is only supported for interface type 'network' with forward type 'nat', 'route', 'open' or none"));
> 
> Please break this long line.

Please do not break this long line as stated in our hacking guide [1].

Pavel

[1] <https://libvirt.org/hacking.html#errors>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20200212/f32acc97/attachment-0001.sig>