[libvirt PATCH 5/5] qemu: reuse convenience variable introduced in a00b97f27672b3

Michal Privoznik mprivozn at redhat.com
Wed Feb 12 08:20:51 UTC 2020


On 2/10/20 5:10 PM, Pavel Mores wrote:
> Since we have the result of a compound condition named now we can use it
> to simplify another complex condition to make it more readable.
> 
> Signed-off-by: Pavel Mores <pmores at redhat.com>
> ---
>   src/network/bridge_driver.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 

libvirt.git $ git describe a00b97f27672b3
fatal: Not a valid object name a00b97f27672b3

;-)

> diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
> index 513ae59e68..584c78cadb 100644
> --- a/src/network/bridge_driver.c
> +++ b/src/network/bridge_driver.c
> @@ -5081,8 +5081,7 @@ networkCheckBandwidth(virNetworkObjPtr obj,
>           return -1;
>       }
>   
> -    if (ifaceBand && ifaceBand->in && ifaceBand->in->floor &&
> -        !(netBand && netBand->in)) {
> +    if (floorRequested && !(netBand && netBand->in)) {
>           virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
>                          _("Invalid use of 'floor' on interface with MAC "
>                            "address %s - network '%s' has no inbound QoS set"),
> 

As I'm saying in review of 2/5, this won't be needed.

Michal




More information about the libvir-list mailing list