External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

lxc: Use consistent error preservation and restoration calls

Browse Source 
Provide some consistency over error message variable name and usage
when saving error messages across possible other errors or possibility
of resetting of the last error.

Instead of virSaveLastError paired up with virSetError and virFreeError,
we should use the newer virErrorPreserveLast and virRestoreError.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
John Ferlan 2018-12-06 12:32:37 -05:00
parent 57a9d2fe01
commit 0daec35370
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lxc/lxc_driver.c
View File

@ -1857,12 +1857,11 @@ static int lxcSetVcpuBWLive(virCgroupPtr cgroup, unsigned long long period,
error:
if (period) {
virErrorPtr saved = virSaveLastError();
virErrorPtr saved;
virErrorPreserveLast(&saved);
virCgroupSetCpuCfsPeriod(cgroup, old_period);
if (saved) {
virSetError(saved);
virFreeError(saved);
}
virErrorRestore(&saved);
}
return -1;

7
src/lxc/lxc_process.c
View File

@ -1568,7 +1568,7 @@ int virLXCProcessStart(virConnectPtr conn,
rc = -1;
}
if (rc != 0) {
err = virSaveLastError();
virErrorPreserveLast(&err);
virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED);
}
virCommandFree(cmd);
@ -1582,10 +1582,7 @@ int virLXCProcessStart(virConnectPtr conn,
virObjectUnref(cfg);
virObjectUnref(caps);
if (err) {
virSetError(err);
virFreeError(err);
}
virErrorRestore(&err);
return rc;
}