External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vircgroup: Call virCgroupRemove inside virCgroupMakeGroup

Browse Source 
This fixes virCgroupEnableMissingControllers where virCgroupRemove
was not called in case virCgroupMakeGroup failed.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2018-08-17 15:00:44 +02:00
parent 998658bd1e
commit b013bdfd79
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/util/vircgroup.c
View File

@ -1052,7 +1052,7 @@ virCgroupMakeGroup(virCgroupPtr parent,
} }
if (virCgroupPathOfController(group, i, "", &path) < 0) if (virCgroupPathOfController(group, i, "", &path) < 0)
return -1; goto error;
/* As of Feb 2011, clang can't see that the above function /* As of Feb 2011, clang can't see that the above function
* call did not modify group. */ * call did not modify group. */
@ -1076,7 +1076,7 @@ virCgroupMakeGroup(virCgroupPtr parent,
virReportSystemError(errno, virReportSystemError(errno,
_("Failed to create controller %s for group"), _("Failed to create controller %s for group"),
virCgroupControllerTypeToString(i)); virCgroupControllerTypeToString(i));
return -1; goto error;
} }
} }
if (group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint != NULL && if (group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint != NULL &&
@ -1084,7 +1084,7 @@ virCgroupMakeGroup(virCgroupPtr parent,
STREQ(group->controllers[i].mountPoint, STREQ(group->controllers[i].mountPoint,
group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint))) { group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint))) {
if (virCgroupCpuSetInherit(parent, group) < 0) if (virCgroupCpuSetInherit(parent, group) < 0)
return -1; goto error;
} }
/* /*
* Note that virCgroupSetMemoryUseHierarchy should always be * Note that virCgroupSetMemoryUseHierarchy should always be
@ -1096,13 +1096,17 @@ virCgroupMakeGroup(virCgroupPtr parent,
STREQ(group->controllers[i].mountPoint, STREQ(group->controllers[i].mountPoint,
group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint))) { group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint))) {
if (virCgroupSetMemoryUseHierarchy(group) < 0) if (virCgroupSetMemoryUseHierarchy(group) < 0)
return -1; goto error;
} }
} }
} }
VIR_DEBUG("Done making controllers for group"); VIR_DEBUG("Done making controllers for group");
return 0; return 0;
error:
virCgroupRemove(group);
return -1;
} }
@ -1316,10 +1320,8 @@ virCgroupNewPartition(const char *path,
if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0) if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0)
goto cleanup; goto cleanup;
if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) { if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0)
virCgroupRemove(*group);
goto cleanup; goto cleanup;
}
} }
ret = 0; ret = 0;
@ -1389,7 +1391,6 @@ virCgroupNewDomainPartition(virCgroupPtr partition,
*/ */
if (virCgroupMakeGroup(partition, *group, create, if (virCgroupMakeGroup(partition, *group, create,
VIR_CGROUP_MEM_HIERACHY) < 0) { VIR_CGROUP_MEM_HIERACHY) < 0) {
virCgroupRemove(*group);
virCgroupFree(group); virCgroupFree(group);
return -1; return -1;
} }
@ -1446,7 +1447,6 @@ virCgroupNewThread(virCgroupPtr domain,
return -1; return -1;
if (virCgroupMakeGroup(domain, *group, create, VIR_CGROUP_NONE) < 0) { if (virCgroupMakeGroup(domain, *group, create, VIR_CGROUP_NONE) < 0) {
virCgroupRemove(*group);
virCgroupFree(group); virCgroupFree(group);
return -1; return -1;
} }