<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 | 23 +----------------------<br>
src/util/vircgroupbackend.h | 5 +++++<br>
src/util/vircgroupv1.c | 22 ++++++++++++++++++++++<br>
3 files changed, 28 insertions(+), 22 deletions(-)<br>
<br>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c<br>
index 9d6eebc2b9..f5b2a14df9 100644<br>
--- a/src/util/vircgroup.c<br>
+++ b/src/util/vircgroup.c<br>
@@ -237,27 +237,6 @@ virCgroupPartitionEscape(char **path)<br>
}<br>
<br>
<br>
-static int<br>
-virCgroupCopyMounts(virCgroup<wbr>Ptr group,<br>
- virCgroupPtr parent)<br>
-{<br>
- size_t i;<br>
- for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {<br>
- if (!parent->controllers[i].mount<wbr>Point)<br>
- continue;<br>
-<br>
- if (VIR_STRDUP(group->controllers<wbr>[i].mountPoint,<br>
- parent->controllers[i].mountP<wbr>oint) < 0)<br>
- return -1;<br>
-<br>
- if (VIR_STRDUP(group->controllers<wbr>[i].linkPoint,<br>
- parent->controllers[i].linkPo<wbr>int) < 0)<br>
- return -1;<br>
- }<br>
- return 0;<br>
-}<br>
-<br>
-<br>
static int<br>
virCgroupResolveMountLink(con<wbr>st char *mntDir,<br>
const char *typeStr,<br>
@@ -655,7 +634,7 @@ virCgroupDetect(virCgroupPtr group,<br>
}<br>
<br>
if (parent) {<br>
- if (virCgroupCopyMounts(group, parent) < 0)<br>
+ if (group->backend->copyMounts(gr<wbr>oup, parent) < 0)<br>
return -1;<br>
} else {<br>
if (virCgroupDetectMounts(group) < 0)<br>
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h<br>
index daf47bac09..81ee597fc8 100644<br>
--- a/src/util/vircgroupbackend.h<br>
+++ b/src/util/vircgroupbackend.h<br>
@@ -41,12 +41,17 @@ typedef bool<br>
const char *drivername,<br>
const char *machinename);<br>
<br>
+typedef int<br>
+(*virCgroupCopyMountsCB)(virC<wbr>groupPtr group,<br>
+ virCgroupPtr parent);<br>
+<br>
struct _virCgroupBackend {<br>
virCgroupBackendType type;<br>
<br>
/* Mandatory callbacks that need to be implemented for every backend. */<br>
virCgroupAvailableCB available;<br>
<wbr>virCgroupValidateMachineGroupC<wbr>B validateMachineGroup;<br>
+ virCgroupCopyMountsCB copyMounts;<br>
};<br>
typedef struct _virCgroupBackend virCgroupBackend;<br>
typedef virCgroupBackend *virCgroupBackendPtr;<br>
diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c<br>
index 48e3d412ae..00c3349aee 100644<br>
--- a/src/util/vircgroupv1.c<br>
+++ b/src/util/vircgroupv1.c<br>
@@ -159,11 +159,33 @@ virCgroupV1ValidateMachineGrou<wbr>p(virCgroupPtr group,<br>
}<br>
<br>
<br>
+static int<br>
+virCgroupV1CopyMounts(virCgro<wbr>upPtr group,<br>
+ virCgroupPtr parent)<br>
+{<br>
+ size_t i;<br>
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {<br>
+ if (!parent->controllers[i].mount<wbr>Point)<br>
+ continue;<br>
+<br>
+ if (VIR_STRDUP(group->controllers<wbr>[i].mountPoint,<br>
+ parent->controllers[i].mountP<wbr>oint) < 0)<br>
+ return -1;<br>
+<br>
+ if (VIR_STRDUP(group->controllers<wbr>[i].linkPoint,<br>
+ parent->controllers[i].linkPo<wbr>int) < 0)<br>
+ return -1;<br>
+ }<br>
+ return 0;<br>
+}<br>
+<br>
+<br>
virCgroupBackend virCgroupV1Backend = {<br>
.type = VIR_CGROUP_BACKEND_TYPE_V1,<br>
<br>
.available = virCgroupV1Available,<br>
.validateMachineGroup = virCgroupV1ValidateMachineGrou<wbr>p,<br>
+ .copyMounts = virCgroupV1CopyMounts,<br>
};<br>
<span class="m_-7107585884540157792HOEnZb"><font color="#888888"> <br>
<br>
-- <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>