<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 | 32 +-----------------------------<wbr>--<br>
src/util/vircgroupbackend.h | 5 +++++<br>
src/util/vircgroupv1.c | 31 ++++++++++++++++++++++++++++++<wbr>+<br>
3 files changed, 37 insertions(+), 31 deletions(-)<br>
<br>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c<br>
index 0fcb047a0c..864dd876b0 100644<br>
--- a/src/util/vircgroup.c<br>
+++ b/src/util/vircgroup.c<br>
@@ -351,36 +351,6 @@ virCgroupDetectPlacement(virCg<wbr>roupPtr group,<br>
}<br>
<br>
<br>
-static int<br>
-virCgroupValidatePlacement(vi<wbr>rCgroupPtr group,<br>
- pid_t pid)<br>
-{<br>
- size_t i;<br>
-<br>
- for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {<br>
- if (!group->controllers[i].mountP<wbr>oint)<br>
- continue;<br>
-<br>
- if (!group->controllers[i].placem<wbr>ent) {<br>
- virReportError(VIR_ERR_INTERNA<wbr>L_ERROR,<br>
- _("Could not find placement for controller %s at %s"),<br>
- <wbr>virCgroupControllerTypeToStrin<wbr>g(i),<br>
- group->controllers[i].placeme<wbr>nt);<br>
- return -1;<br>
- }<br>
-<br>
- VIR_DEBUG("Detected mount/mapping %zu:%s at %s in %s for pid %lld",<br>
- i,<br>
- virCgroupControllerTypeToStrin<wbr>g(i),<br>
- group->controllers[i].mountPoi<wbr>nt,<br>
- group->controllers[i].placemen<wbr>t,<br>
- (long long) pid);<br>
- }<br>
-<br>
- return 0;<br>
-}<br>
-<br>
-<br>
static int<br>
virCgroupDetectControllers(vi<wbr>rCgroupPtr group,<br>
int controllers)<br>
@@ -506,7 +476,7 @@ virCgroupDetect(virCgroupPtr group,<br>
return -1;<br>
<br>
/* Check that for every mounted controller, we found our placement */<br>
- if (virCgroupValidatePlacement(gr<wbr>oup, pid) < 0)<br>
+ if (group->backend->validatePlace<wbr>ment(group, pid) < 0)<br>
return -1;<br>
<br>
return 0;<br>
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h<br>
index 85906e7191..086cfb8090 100644<br>
--- a/src/util/vircgroupbackend.h<br>
+++ b/src/util/vircgroupbackend.h<br>
@@ -62,6 +62,10 @@ typedef int<br>
const char *controllers,<br>
const char *selfpath);<br>
<br>
+typedef int<br>
+(*virCgroupValidatePlacementC<wbr>B)(virCgroupPtr group,<br>
+ pid_t pid);<br>
+<br>
struct _virCgroupBackend {<br>
virCgroupBackendType type;<br>
<br>
@@ -72,6 +76,7 @@ struct _virCgroupBackend {<br>
virCgroupCopyPlacementCB copyPlacement;<br>
virCgroupDetectMountsCB detectMounts;<br>
virCgroupDetectPlacementCB detectPlacement;<br>
+ virCgroupValidatePlacementCB validatePlacement;<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 f73f40db0e..68df323d72 100644<br>
--- a/src/util/vircgroupv1.c<br>
+++ b/src/util/vircgroupv1.c<br>
@@ -372,6 +372,36 @@ virCgroupV1DetectPlacement(vir<wbr>CgroupPtr group,<br>
}<br>
<br>
<br>
+static int<br>
+virCgroupV1ValidatePlacement(<wbr>virCgroupPtr group,<br>
+ pid_t pid)<br>
+{<br>
+ size_t i;<br>
+<br>
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {<br>
+ if (!group->controllers[i].mountP<wbr>oint)<br>
+ continue;<br>
+<br>
+ if (!group->controllers[i].placem<wbr>ent) {<br>
+ virReportError(VIR_ERR_INTERNA<wbr>L_ERROR,<br>
+ _("Could not find placement for v1 controller %s at %s"),<br>
+ <wbr>virCgroupV1ControllerTypeToStr<wbr>ing(i),<br>
+ group->controllers[i].placeme<wbr>nt);<br>
+ return -1;<br>
+ }<br>
+<br>
+ VIR_DEBUG("Detected mount/mapping %zu:%s at %s in %s for pid %lld",<br>
+ i,<br>
+ virCgroupV1ControllerTypeToStr<wbr>ing(i),<br>
+ group->controllers[i].mountPoi<wbr>nt,<br>
+ group->controllers[i].placemen<wbr>t,<br>
+ (long long) pid);<br>
+ }<br>
+<br>
+ return 0;<br>
+}<br>
+<br>
+<br>
virCgroupBackend virCgroupV1Backend = {<br>
.type = VIR_CGROUP_BACKEND_TYPE_V1,<br>
<br>
@@ -381,6 +411,7 @@ virCgroupBackend virCgroupV1Backend = {<br>
.copyPlacement = virCgroupV1CopyPlacement,<br>
.detectMounts = virCgroupV1DetectMounts,<br>
.detectPlacement = virCgroupV1DetectPlacement,<br>
+ .validatePlacement = virCgroupV1ValidatePlacement,<br>
};<br>
<span class="m_-8005617470547707500HOEnZb"><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>