On 06/21/2013 09:23 PM, John Ferlan wrote:
On 06/21/2013 01:30 PM, Ján Tomko wrote:
If networkUnplugBandwidth is called on a network which has no bandwidth defined, print a warning instead of crashing.
This can happen when destroying a domain with bandwith if
s/bandwith/bandwidth
bandwidth was removed from the network after the domain was started.
https://bugzilla.redhat.com/show_bug.cgi?id=975359 --- src/network/bridge_driver.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f7c2470..72a3f70 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4808,6 +4808,11 @@ networkUnplugBandwidth(virNetworkObjPtr net,
if (iface->data.network.actual && iface->data.network.actual->class_id) { + if (!net->def->bandwidth || !net->def->bandwidth->in) { + VIR_WARN("Network %s has no bandwidth but unplug requested", + net->def->name); + goto cleanup; + } /* we must remove class from bridge */ new_rate = net->def->bandwidth->in->average;
I don't know the code well enough - I can understand why there's a crash if bandwidth == NULL; however, it wasn't clear to me whether or not it might be necessary to make the other calls that didn't rely on bandwidth != NULL but do pass/use class_id.
John
If I understand it correctly: if the network has no bandwidth, its bridge shouldn't have any class_ids set and there should be nothing to clean up. Jan