[libvirt] [PATCH v2 1/9] vircgroup: cleanup controllers not managed by systemd on error
If virCgroupEnableMissingControllers() fails it could already create
some directories, we should clean it up as well.
Reviewed-by: Fabiano Fidêncio <fidencio(a)redhat.com>
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/util/vircgroup.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index c825f7c77e..f9e387c86d 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -1551,6 +1551,7 @@ virCgroupNewMachineSystemd(const char *name,
int rv;
virCgroupPtr init;
VIR_AUTOFREE(char *) path = NULL;
+ virErrorPtr saved = NULL;
VIR_DEBUG("Trying to setup machine '%s' via systemd", name);
if ((rv = virSystemdCreateMachine(name,
@@ -1584,20 +1585,24 @@ virCgroupNewMachineSystemd(const char *name,
if (virCgroupEnableMissingControllers(path, pidleader,
controllers, group) < 0) {
- return -1;
+ goto error;
}
- if (virCgroupAddTask(*group, pidleader) < 0) {
- virErrorPtr saved = virSaveLastError();
- virCgroupRemove(*group);
- virCgroupFree(group);
- if (saved) {
- virSetError(saved);
- virFreeError(saved);
- }
- }
+ if (virCgroupAddTask(*group, pidleader) < 0)
+ goto error;
return 0;
+
+ error:
+ saved = virSaveLastError();
+ virCgroupRemove(*group);
+ virCgroupFree(group);
+ if (saved) {
+ virSetError(saved);
+ virFreeError(saved);
+ }
+
+ return -1;
}
--
2.17.1