Revert "network: Check for QOS before blindly using it"

This reverts commit f4db846c32.

This patch results in the following error when trying to start
essentially any VM with default network:

unsupported configuration: QOS must be defined for network 'default'

Coverity didn't see that the bandwidth == NULL it complained about in
virNetDevBandwidthPlug was already checked properly in
networkCheckBandwidth, thus causing networkPlugBandwidth to return 0
and finish before a call to virNetDevBandwidthPlug would have been even
made.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Erik Skultety 2019-11-22 16:21:33 +01:00
parent bc7e72914a
commit 36a01c2a47

View File

@ -4567,13 +4567,6 @@ networkAllocatePort(virNetworkObjPtr obj,
return -1;
}
if (!port->bandwidth) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("QOS must be defined for network '%s'"),
netdef->name);
return -1;
}
if (networkPlugBandwidth(obj, &port->mac, port->bandwidth, &port->class_id) < 0)
return -1;
break;
@ -4640,13 +4633,6 @@ networkAllocatePort(virNetworkObjPtr obj,
}
}
if (!port->bandwidth) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("QOS must be defined for network '%s'"),
netdef->name);
return -1;
}
if (networkPlugBandwidth(obj, &port->mac, port->bandwidth, &port->class_id) < 0)
return -1;
break;