[libvirt] [PATCH 12/17] vircgroup: Use virCgroupMountOptsMatchController in virCgroupDetectPlacement
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/util/vircgroup.c | 43 ++++++++++++++-----------------------------
1 file changed, 14 insertions(+), 29 deletions(-)
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 52be5e5fb8..45fe2595d1 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -598,42 +598,27 @@ virCgroupDetectPlacement(virCgroupPtr group,
for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
const char *typestr = virCgroupControllerTypeToString(i);
- int typelen = strlen(typestr);
- char *tmp = controllers;
-
- while (tmp) {
- char *next = strchr(tmp, ',');
- int len;
- if (next) {
- len = next - tmp;
- next++;
- } else {
- len = strlen(tmp);
- }
+ if (virCgroupMountOptsMatchController(controllers, typestr) &&
+ group->controllers[i].mountPoint != NULL &&
+ group->controllers[i].placement == NULL) {
/*
* selfpath == "/" + path="" -> "/"
* selfpath == "/libvirt.service" + path == "" ->
"/libvirt.service"
* selfpath == "/libvirt.service" + path == "foo"
-> "/libvirt.service/foo"
*/
- if (typelen == len && STREQLEN(typestr, tmp, len) &&
- group->controllers[i].mountPoint != NULL &&
- group->controllers[i].placement == NULL) {
- if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) {
- if (VIR_STRDUP(group->controllers[i].placement,
- selfpath) < 0)
- goto cleanup;
- } else {
- if (virAsprintf(&group->controllers[i].placement,
- "%s%s%s", selfpath,
- (STREQ(selfpath, "/") ||
- STREQ(path, "") ? "" :
"/"),
- path) < 0)
- goto cleanup;
- }
+ if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) {
+ if (VIR_STRDUP(group->controllers[i].placement,
+ selfpath) < 0)
+ goto cleanup;
+ } else {
+ if (virAsprintf(&group->controllers[i].placement,
+ "%s%s%s", selfpath,
+ (STREQ(selfpath, "/") ||
+ STREQ(path, "") ? "" :
"/"),
+ path) < 0)
+ goto cleanup;
}
-
- tmp = next;
}
}
}
--
2.17.1