External/libvirt
1
0
Fork 0
Code

LXC cleanup deep indentation in lxcDomainSetAutostart

Browse Source 
* src/lxc/lxc_driver.c: refactor lxcDomainSetAutostart() to avoid deep
  indentation of the code
This commit is contained in:
Ryota Ozaki 2009-11-05 13:41:14 +01:00 committed by Daniel Veillard
parent 24e3b35c6c
commit a9cb354833
1 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/lxc/lxc_driver.c
View File

@ -1992,39 +1992,46 @@ static int lxcDomainSetAutostart(virDomainPtr dom,
autostart = (autostart != 0); autostart = (autostart != 0);
if (vm->autostart != autostart) { if (vm->autostart == autostart) {
if ((configFile = virDomainConfigFile(dom->conn, driver->configDir, vm->def->name)) == NULL) ret = 0;
goto cleanup;
}
configFile = virDomainConfigFile(dom->conn, driver->configDir,
vm->def->name);
if (configFile == NULL)
goto cleanup;
autostartLink = virDomainConfigFile(dom->conn, driver->autostartDir,
vm->def->name);
if (autostartLink == NULL)
goto cleanup;
if (autostart) {
int err;
if ((err = virFileMakePath(driver->autostartDir))) {
virReportSystemError(dom->conn, err,
_("Cannot create autostart directory %s"),
driver->autostartDir);
goto cleanup; goto cleanup;
if ((autostartLink = virDomainConfigFile(dom->conn, driver->autostartDir, vm->def->name)) == NULL)
goto cleanup;
if (autostart) {
int err;
if ((err = virFileMakePath(driver->autostartDir))) {
virReportSystemError(dom->conn, err,
_("Cannot create autostart directory %s"),
driver->autostartDir);
goto cleanup;
}
if (symlink(configFile, autostartLink) < 0) {
virReportSystemError(dom->conn, errno,
_("Failed to create symlink '%s to '%s'"),
autostartLink, configFile);
goto cleanup;
}
} else {
if (unlink(autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) {
virReportSystemError(dom->conn, errno,
_("Failed to delete symlink '%s'"),
autostartLink);
goto cleanup;
}
} }
vm->autostart = autostart; if (symlink(configFile, autostartLink) < 0) {
virReportSystemError(dom->conn, errno,
_("Failed to create symlink '%s to '%s'"),
autostartLink, configFile);
goto cleanup;
}
} else {
if (unlink(autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) {
virReportSystemError(dom->conn, errno,
_("Failed to delete symlink '%s'"),
autostartLink);
goto cleanup;
}
} }
vm->autostart = autostart;
ret = 0; ret = 0;
cleanup: cleanup: