External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid squashing errors during network startup cleanup path

Browse Source 
When failing to start a virtual network, we have to cleanup,
tearing down any iptables rules. If the iptables rules were
not present yet though, this raises an error, which squashes
the original error we were handling.

* src/network/bridge_driver.c: When failing to start a virtual
  network, don't squash the original error in cleanup
This commit is contained in:
Daniel P. Berrange 2010-10-26 11:17:25 +01:00
parent d88a0496fd
commit d68bb70a2d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/bridge_driver.c
View File

@ -1171,6 +1171,7 @@ static int networkStartNetworkDaemon(struct network_driver *driver,
virNetworkObjPtr network)
{
int err;
virErrorPtr save_err;
if (virNetworkObjIsActive(network)) {
networkReportError(VIR_ERR_INTERNAL_ERROR,
@ -1255,7 +1256,12 @@ static int networkStartNetworkDaemon(struct network_driver *driver,
}
err_delbr2:
save_err = virSaveLastError();
networkRemoveIptablesRules(driver, network);
if (save_err) {
virSetError(save_err);
virFreeError(save_err);
}
err_delbr1:
if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {