[libvirt] [PATCH 3/7] qemu: Fix job handling in qemuDomainSetAutostart
The code modifies the domain configuration but doesn't take a MODIFY
type job to do so.
This patch also fixes a few very long lines of code around the touched
parts.
---
src/qemu/qemu_driver.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index fa2259a..ecb3693 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -8040,35 +8040,45 @@ static int qemuDomainSetAutostart(virDomainPtr dom,
autostart = (autostart != 0);
if (vm->autostart != autostart) {
- if ((configFile = virDomainConfigFile(cfg->configDir, vm->def->name)) ==
NULL)
- goto cleanup;
- if ((autostartLink = virDomainConfigFile(cfg->autostartDir,
vm->def->name)) == NULL)
+ if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup;
+ if (!(configFile = virDomainConfigFile(cfg->configDir, vm->def->name)))
+ goto endjob;
+
+ if (!(autostartLink = virDomainConfigFile(cfg->autostartDir,
+ vm->def->name)))
+ goto endjob;
+
if (autostart) {
if (virFileMakePath(cfg->autostartDir) < 0) {
virReportSystemError(errno,
_("cannot create autostart directory
%s"),
cfg->autostartDir);
- goto cleanup;
+ goto endjob;
}
if (symlink(configFile, autostartLink) < 0) {
virReportSystemError(errno,
_("Failed to create symlink '%s to
'%s'"),
autostartLink, configFile);
- goto cleanup;
+ goto endjob;
}
} else {
- if (unlink(autostartLink) < 0 && errno != ENOENT && errno
!= ENOTDIR) {
+ if (unlink(autostartLink) < 0 &&
+ errno != ENOENT &&
+ errno != ENOTDIR) {
virReportSystemError(errno,
_("Failed to delete symlink
'%s'"),
autostartLink);
- goto cleanup;
+ goto endjob;
}
}
vm->autostart = autostart;
+
+ endjob:
+ qemuDomainObjEndJob(driver, vm);
}
ret = 0;
--
2.2.1