mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-22 12:35:17 +00:00
Don't overwrite errors from virNetDevBandwidthSet
Otherwise this beautiful error would be overwritten when the function is called with a really high rate number: 2014-07-28 12:51:47.920+0000: 2304: error : virCommandWait:2399 : internal error: Child process (/sbin/tc class add dev vnet0 parent 1: classid 1:1 htb rate 4294968kbps) unexpected exit status 1: Illegal "rate" Usage: ... qdisc add ... htb [default N] [r2q N] default minor id of class to which unclassified packets are sent {0} r2q DRR quantums are computed as rate in Bps/r2q {10} debug string of 16 numbers each 0-3 {0} ... class add ... htb rate R1 [burst B1] [mpu B] [overhead O] [prio P] [slot S] [pslot PS] [ceil R2] [cburst B2] [mtu MTU] [quantum Q] rate rate allocated to this class (class can still borrow) burst max bytes burst which can be accumulated during idle period {computed} mpu minimum packet size used in rate computations overhead per-packet size overhead used in rate computations linklay adapting to a linklayer e.g. atm ceil definite upper class rate (no borrows) {rate} cburst burst but for ceil {computed} mtu max packet size we create rate map for {1600} prio priority of leaf; lowe https://bugzilla.redhat.com/show_bug.cgi?id=1043735
This commit is contained in:
parent
ee668206cd
commit
6dac5d06f5
@ -276,12 +276,8 @@ char *virLXCProcessSetupInterfaceBridged(virConnectPtr conn,
|
||||
|
||||
if (virNetDevBandwidthSet(net->ifname,
|
||||
virDomainNetGetActualBandwidth(net),
|
||||
false) < 0) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("cannot set bandwidth limits on %s"),
|
||||
net->ifname);
|
||||
false) < 0)
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (net->filter &&
|
||||
virDomainConfNWFilterInstantiate(conn, vm->uuid, net) < 0)
|
||||
|
@ -2081,12 +2081,8 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
|
||||
}
|
||||
|
||||
if (virNetDevBandwidthSet(network->def->bridge,
|
||||
network->def->bandwidth, true) < 0) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("cannot set bandwidth limits on %s"),
|
||||
network->def->bridge);
|
||||
network->def->bandwidth, true) < 0)
|
||||
goto err5;
|
||||
}
|
||||
|
||||
VIR_FREE(macTapIfName);
|
||||
|
||||
|
@ -382,12 +382,8 @@ qemuNetworkIfaceConnect(virDomainDefPtr def,
|
||||
|
||||
if (virNetDevBandwidthSet(net->ifname,
|
||||
virDomainNetGetActualBandwidth(net),
|
||||
false) < 0) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("cannot set bandwidth limits on %s"),
|
||||
net->ifname);
|
||||
false) < 0)
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (net->filter && net->ifname &&
|
||||
virDomainConfNWFilterInstantiate(conn, def->uuid, net) < 0) {
|
||||
|
@ -9961,12 +9961,8 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
|
||||
sizeof(*newBandwidth->out));
|
||||
}
|
||||
|
||||
if (virNetDevBandwidthSet(net->ifname, newBandwidth, false) < 0) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("cannot set bandwidth limits on %s"),
|
||||
device);
|
||||
if (virNetDevBandwidthSet(net->ifname, newBandwidth, false) < 0)
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
virNetDevBandwidthFree(net->bandwidth);
|
||||
if (newBandwidth->in || newBandwidth->out) {
|
||||
|
@ -2181,12 +2181,8 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
|
||||
if (needBandwidthSet) {
|
||||
if (virNetDevBandwidthSet(newdev->ifname,
|
||||
virDomainNetGetActualBandwidth(newdev),
|
||||
false) < 0) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("cannot set bandwidth limits on %s"),
|
||||
newdev->ifname);
|
||||
false) < 0)
|
||||
goto cleanup;
|
||||
}
|
||||
needReplaceDevDef = true;
|
||||
}
|
||||
|
||||
|
@ -922,9 +922,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname,
|
||||
}
|
||||
|
||||
if (virNetDevBandwidthSet(cr_ifname, bandwidth, false) < 0) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("cannot set bandwidth limits on %s"),
|
||||
cr_ifname);
|
||||
if (withTap)
|
||||
VIR_FORCE_CLOSE(rc); /* sets rc to -1 */
|
||||
else
|
||||
|
Loading…
x
Reference in New Issue
Block a user