<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Sep 18, 2018 at 5:45 PM, Pavel Hrdina <span dir="ltr"><<a href="mailto:phrdina@redhat.com" target="_blank">phrdina@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Pavel Hrdina <<a href="mailto:phrdina@redhat.com" target="_blank">phrdina@redhat.com</a>><br></blockquote><div><br></div><div>Reviewed-by: Fabiano Fidêncio <<a href="mailto:fidencio@redhat.com" target="_blank">fidencio@redhat.com</a>><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
src/util/vircgroup.c | 38 +-----------------------------<wbr>-------<br>
src/util/vircgroupbackend.h | 6 ++++++<br>
src/util/vircgroupv1.c | 37 ++++++++++++++++++++++++++++++<wbr>++++++<br>
3 files changed, 44 insertions(+), 37 deletions(-)<br>
<br>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c<br>
index 7557fc5576..0fcb047a0c 100644<br>
--- a/src/util/vircgroup.c<br>
+++ b/src/util/vircgroup.c<br>
@@ -271,42 +271,6 @@ virCgroupDetectMounts(virCgrou<wbr>pPtr group)<br>
}<br>
<br>
<br>
-static int<br>
-virCgroupCopyPlacement(virCgr<wbr>oupPtr group,<br>
- const char *path,<br>
- virCgroupPtr parent)<br>
-{<br>
- size_t i;<br>
- for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {<br>
- if (!group->controllers[i].mountP<wbr>oint)<br>
- continue;<br>
-<br>
- if (i == VIR_CGROUP_CONTROLLER_SYSTEMD)<br>
- continue;<br>
-<br>
- if (path[0] == '/') {<br>
- if (VIR_STRDUP(group->controllers<wbr>[i].placement, path) < 0)<br>
- return -1;<br>
- } else {<br>
- /*<br>
- * parent == "/" + path="" => "/"<br>
- * parent == "/libvirt.service" + path == "" => "/libvirt.service"<br>
- * parent == "/libvirt.service" + path == "foo" => "/libvirt.service/foo"<br>
- */<br>
- if (virAsprintf(&group->controlle<wbr>rs[i].placement,<br>
- "%s%s%s",<br>
- parent->controllers[i].placeme<wbr>nt,<br>
- (STREQ(parent->controllers[i].<wbr>placement, "/") ||<br>
- STREQ(path, "") ? "" : "/"),<br>
- path) < 0)<br>
- return -1;<br>
- }<br>
- }<br>
-<br>
- return 0;<br>
-}<br>
-<br>
-<br>
/*<br>
* virCgroupDetectPlacement:<br>
* @group: the group to process<br>
@@ -534,7 +498,7 @@ virCgroupDetect(virCgroupPtr group,<br>
* based on the parent cgroup...<br>
*/<br>
if ((parent || path[0] == '/') &&<br>
- virCgroupCopyPlacement(group, path, parent) < 0)<br>
+ group->backend->copyPlacement(<wbr>group, path, parent) < 0)<br>
return -1;<br>
<br>
/* ... but use /proc/cgroups to fill in the rest */<br>
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h<br>
index fadc7efdcf..85906e7191 100644<br>
--- a/src/util/vircgroupbackend.h<br>
+++ b/src/util/vircgroupbackend.h<br>
@@ -45,6 +45,11 @@ typedef int<br>
(*virCgroupCopyMountsCB)(virC<wbr>groupPtr group,<br>
virCgroupPtr parent);<br>
<br>
+typedef int<br>
+(*virCgroupCopyPlacementCB)(v<wbr>irCgroupPtr group,<br>
+ const char *path,<br>
+ virCgroupPtr parent);<br>
+<br>
typedef int<br>
(*virCgroupDetectMountsCB)(vi<wbr>rCgroupPtr group,<br>
const char *mntType,<br>
@@ -64,6 +69,7 @@ struct _virCgroupBackend {<br>
virCgroupAvailableCB available;<br>
<wbr>virCgroupValidateMachineGroupC<wbr>B validateMachineGroup;<br>
virCgroupCopyMountsCB copyMounts;<br>
+ virCgroupCopyPlacementCB copyPlacement;<br>
virCgroupDetectMountsCB detectMounts;<br>
virCgroupDetectPlacementCB detectPlacement;<br>
};<br>
diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c<br>
index 2882a19be2..f73f40db0e 100644<br>
--- a/src/util/vircgroupv1.c<br>
+++ b/src/util/vircgroupv1.c<br>
@@ -182,6 +182,42 @@ virCgroupV1CopyMounts(virCgrou<wbr>pPtr group,<br>
}<br>
<br>
<br>
+static int<br>
+virCgroupV1CopyPlacement(virC<wbr>groupPtr group,<br>
+ const char *path,<br>
+ virCgroupPtr parent)<br>
+{<br>
+ size_t i;<br>
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {<br>
+ if (!group->controllers[i].mountP<wbr>oint)<br>
+ continue;<br>
+<br>
+ if (i == VIR_CGROUP_CONTROLLER_SYSTEMD)<br>
+ continue;<br>
+<br>
+ if (path[0] == '/') {<br>
+ if (VIR_STRDUP(group->controllers<wbr>[i].placement, path) < 0)<br>
+ return -1;<br>
+ } else {<br>
+ /*<br>
+ * parent == "/" + path="" => "/"<br>
+ * parent == "/libvirt.service" + path == "" => "/libvirt.service"<br>
+ * parent == "/libvirt.service" + path == "foo" => "/libvirt.service/foo"<br>
+ */<br>
+ if (virAsprintf(&group->controlle<wbr>rs[i].placement,<br>
+ "%s%s%s",<br>
+ parent->controllers[i].placeme<wbr>nt,<br>
+ (STREQ(parent->controllers[i].<wbr>placement, "/") ||<br>
+ STREQ(path, "") ? "" : "/"),<br>
+ path) < 0)<br>
+ return -1;<br>
+ }<br>
+ }<br>
+<br>
+ return 0;<br>
+}<br>
+<br>
+<br>
static int<br>
virCgroupV1ResolveMountLink(c<wbr>onst char *mntDir,<br>
const char *typeStr,<br>
@@ -342,6 +378,7 @@ virCgroupBackend virCgroupV1Backend = {<br>
.available = virCgroupV1Available,<br>
.validateMachineGroup = virCgroupV1ValidateMachineGrou<wbr>p,<br>
.copyMounts = virCgroupV1CopyMounts,<br>
+ .copyPlacement = virCgroupV1CopyPlacement,<br>
.detectMounts = virCgroupV1DetectMounts,<br>
.detectPlacement = virCgroupV1DetectPlacement,<br>
};<br>
<span class="m_-3031076227095218101HOEnZb"><font color="#888888">-- <br>
2.17.1<br>
<br>
--<br>
libvir-list mailing list<br>
<a href="mailto:libvir-list@redhat.com" target="_blank">libvir-list@redhat.com</a><br>
<a href="https://www.redhat.com/mailman/listinfo/libvir-list" rel="noreferrer" target="_blank">https://www.redhat.com/mailman<wbr>/listinfo/libvir-list</a><br>
</font></span></blockquote></div><br></div></div>