External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

networkStartNetwork: Be more verbose

Browse Source 
The lack of debug printings might be frustrating in the future.
Moreover, this function doesn't follow the usual pattern we have in the
rest of the code:

  int ret = -1;
  /* do some work */
  ret = 0;
cleanup:
  /* some cleanup work */
  return ret;

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2014-01-31 15:36:13 +01:00
parent 600bca592b
commit e209c07760
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/network/bridge_driver.c
View File

@ -1992,23 +1992,29 @@ static int
networkStartNetwork(virNetworkDriverStatePtr driver, networkStartNetwork(virNetworkDriverStatePtr driver,
virNetworkObjPtr network) virNetworkObjPtr network)
{ {
int ret = 0; int ret = -1;
VIR_DEBUG("driver=%p, network=%p", driver, network);
if (virNetworkObjIsActive(network)) { if (virNetworkObjIsActive(network)) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("network is already active")); "%s", _("network is already active"));
return -1; return ret;
} }
VIR_DEBUG("Beginning network startup process");
VIR_DEBUG("Setting current network def as transient");
if (virNetworkObjSetDefTransient(network, true) < 0) if (virNetworkObjSetDefTransient(network, true) < 0)
return -1; goto cleanup;
switch (network->def->forward.type) { switch (network->def->forward.type) {
case VIR_NETWORK_FORWARD_NONE: case VIR_NETWORK_FORWARD_NONE:
case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_NAT:
case VIR_NETWORK_FORWARD_ROUTE: case VIR_NETWORK_FORWARD_ROUTE:
ret = networkStartNetworkVirtual(driver, network); if (networkStartNetworkVirtual(driver, network) < 0)
goto cleanup;
break; break;
case VIR_NETWORK_FORWARD_BRIDGE: case VIR_NETWORK_FORWARD_BRIDGE:
@ -2016,28 +2022,25 @@ networkStartNetwork(virNetworkDriverStatePtr driver,
case VIR_NETWORK_FORWARD_VEPA: case VIR_NETWORK_FORWARD_VEPA:
case VIR_NETWORK_FORWARD_PASSTHROUGH: case VIR_NETWORK_FORWARD_PASSTHROUGH:
case VIR_NETWORK_FORWARD_HOSTDEV: case VIR_NETWORK_FORWARD_HOSTDEV:
ret = networkStartNetworkExternal(driver, network); if (networkStartNetworkExternal(driver, network) < 0)
goto cleanup;
break; break;
} }
if (ret < 0) {
virNetworkObjUnsetDefTransient(network);
return ret;
}
/* Persist the live configuration now that anything autogenerated /* Persist the live configuration now that anything autogenerated
* is setup. * is setup.
*/ */
if ((ret = virNetworkSaveStatus(driverState->stateDir, VIR_DEBUG("Writing network status to disk");
network)) < 0) { if (virNetworkSaveStatus(driverState->stateDir, network) < 0)
goto error; goto cleanup;
}
VIR_INFO("Starting up network '%s'", network->def->name);
network->active = 1; network->active = 1;
VIR_INFO("Network '%s' started up", network->def->name);
ret = 0;
error: cleanup:
if (ret < 0) { if (ret < 0) {
virNetworkObjUnsetDefTransient(network);
virErrorPtr save_err = virSaveLastError(); virErrorPtr save_err = virSaveLastError();
int save_errno = errno; int save_errno = errno;
networkShutdownNetwork(driver, network); networkShutdownNetwork(driver, network);