<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Sep 18, 2018 at 2:17 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">In cgroup v2 we need to handle processes and threads differently,<br>
following patch will introduce virCgroupAddThread.<br>
<br>
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/libvirt-lxc.c | 2 +-<br>
src/libvirt_private.syms | 4 ++--<br>
src/lxc/lxc_controller.c | 4 ++--<br>
src/qemu/qemu_process.c | 4 ++--<br>
src/qemu/qemu_tpm.c | 2 +-<br>
src/util/vircgroup.c | 32 ++++++++++++++++--------------<wbr>--<br>
src/util/vircgroup.h | 4 ++--<br>
7 files changed, 26 insertions(+), 26 deletions(-)<br>
<br>
diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c<br>
index c9f2146487..9bf0174b95 100644<br>
--- a/src/libvirt-lxc.c<br>
+++ b/src/libvirt-lxc.c<br>
@@ -306,7 +306,7 @@ int virDomainLxcEnterCGroup(virDom<wbr>ainPtr domain,<br>
if (virCgroupNewDetect(domain->id<wbr>, -1, &cgroup) < 0)<br>
goto error;<br>
<br>
- if (virCgroupAddTask(cgroup, getpid()) < 0)<br>
+ if (virCgroupAddProcess(cgroup, getpid()) < 0)<br>
goto error;<br>
<br>
virCgroupFree(&cgroup);<br>
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms<br>
index b9dabfef1b..eac66b0174 100644<br>
--- a/src/libvirt_private.syms<br>
+++ b/src/libvirt_private.syms<br>
@@ -1498,8 +1498,8 @@ virBufferVasprintf;<br>
<br>
<br>
# util/vircgroup.h<br>
-virCgroupAddMachineTask;<br>
-virCgroupAddTask;<br>
+virCgroupAddMachineProcess;<br>
+virCgroupAddProcess;<br>
virCgroupAllowAllDevices;<br>
virCgroupAllowDevice;<br>
virCgroupAllowDevicePath;<br>
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c<br>
index 4e84391bf5..4ead2dc9f0 100644<br>
--- a/src/lxc/lxc_controller.c<br>
+++ b/src/lxc/lxc_controller.c<br>
@@ -875,12 +875,12 @@ static int virLXCControllerSetupCgroupLim<wbr>its(virLXCControllerPtr ctrl)<br>
ctrl->nicindexes)))<br>
goto cleanup;<br>
<br>
- if (virCgroupAddMachineTask(ctrl-<wbr>>cgroup, getpid()) < 0)<br>
+ if (virCgroupAddMachineProcess(ct<wbr>rl->cgroup, getpid()) < 0)<br>
goto cleanup;<br>
<br>
/* Add all qemu-nbd tasks to the cgroup */<br>
for (i = 0; i < ctrl->nnbdpids; i++) {<br>
- if (virCgroupAddMachineTask(ctrl-<wbr>>cgroup, ctrl->nbdpids[i]) < 0)<br>
+ if (virCgroupAddMachineProcess(ct<wbr>rl->cgroup, ctrl->nbdpids[i]) < 0)<br>
goto cleanup;<br>
}<br>
<br>
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c<br>
index 72a59dec55..249dac39f2 100644<br>
--- a/src/qemu/qemu_process.c<br>
+++ b/src/qemu/qemu_process.c<br>
@@ -2549,7 +2549,7 @@ qemuProcessSetupPid(virDomainO<wbr>bjPtr vm,<br>
goto cleanup;<br>
<br>
/* Move the thread to the sub dir */<br>
- if (virCgroupAddTask(cgroup, pid) < 0)<br>
+ if (virCgroupAddProcess(cgroup, pid) < 0)<br>
goto cleanup;<br>
<br>
}<br>
@@ -2787,7 +2787,7 @@ qemuProcessStartManagedPRDaemo<wbr>n(virDomainObjPtr vm)<br>
}<br>
<br>
if (priv->cgroup &&<br>
- virCgroupAddMachineTask(priv-><wbr>cgroup, cpid) < 0)<br>
+ virCgroupAddMachineProcess(pri<wbr>v->cgroup, cpid) < 0)<br>
goto cleanup;<br>
<br>
if (qemuSecurityDomainSetPathLabe<wbr>l(driver, vm, socketPath, true) < 0)<br>
diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c<br>
index 278b262c48..c64114feac 100644<br>
--- a/src/qemu/qemu_tpm.c<br>
+++ b/src/qemu/qemu_tpm.c<br>
@@ -905,7 +905,7 @@ qemuExtTPMSetupCgroup(virQEMUD<wbr>riverPtr driver,<br>
_("Could not get process id of swtpm"));<br>
goto cleanup;<br>
}<br>
- if (virCgroupAddTask(cgroup, pid) < 0)<br>
+ if (virCgroupAddProcess(cgroup, pid) < 0)<br>
goto cleanup;<br>
break;<br>
case VIR_DOMAIN_TPM_TYPE_PASSTHROUG<wbr>H:<br>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c<br>
index 2328957818..cf510fb019 100644<br>
--- a/src/util/vircgroup.c<br>
+++ b/src/util/vircgroup.c<br>
@@ -1183,35 +1183,35 @@ virCgroupAddTaskInternal(virCg<wbr>roupPtr group, pid_t pid, bool withSystemd)<br>
}<br>
<br>
/**<br>
- * virCgroupAddTask:<br>
+ * virCgroupAddProcess:<br>
*<br>
- * @group: The cgroup to add a task to<br>
- * @pid: The pid of the task to add<br>
+ * @group: The cgroup to add a process to<br>
+ * @pid: The pid of the process to add<br>
*<br>
- * Will add the task to all controllers, except the<br>
+ * Will add the process to all controllers, except the<br>
* systemd unit controller.<br>
*<br>
* Returns: 0 on success, -1 on error<br>
*/<br>
int<br>
-virCgroupAddTask(virCgroupPtr group, pid_t pid)<br>
+virCgroupAddProcess(virCgroup<wbr>Ptr group, pid_t pid)<br>
{<br>
return virCgroupAddTaskInternal(group<wbr>, pid, false);<br>
}<br>
<br>
/**<br>
- * virCgroupAddMachineTask:<br>
+ * virCgroupAddMachineProcess:<br>
*<br>
- * @group: The cgroup to add a task to<br>
- * @pid: The pid of the task to add<br>
+ * @group: The cgroup to add a process to<br>
+ * @pid: The pid of the process to add<br>
*<br>
- * Will add the task to all controllers, including the<br>
+ * Will add the process to all controllers, including the<br>
* systemd unit controller.<br>
*<br>
* Returns: 0 on success, -1 on error<br>
*/<br>
int<br>
-virCgroupAddMachineTask(virCg<wbr>roupPtr group, pid_t pid)<br>
+virCgroupAddMachineProcess(vi<wbr>rCgroupPtr group, pid_t pid)<br>
{<br>
return virCgroupAddTaskInternal(group<wbr>, pid, true);<br>
}<br>
@@ -1592,7 +1592,7 @@ virCgroupNewMachineSystemd(con<wbr>st char *name,<br>
goto error;<br>
}<br>
<br>
- if (virCgroupAddTask(*group, pidleader) < 0)<br>
+ if (virCgroupAddProcess(*group, pidleader) < 0)<br>
goto error;<br>
<br>
return 0;<br>
@@ -1648,7 +1648,7 @@ virCgroupNewMachineManual(cons<wbr>t char *name,<br>
group) < 0)<br>
goto cleanup;<br>
<br>
- if (virCgroupAddTask(*group, pidleader) < 0) {<br>
+ if (virCgroupAddProcess(*group, pidleader) < 0) {<br>
virErrorPtr saved = virSaveLastError();<br>
virCgroupRemove(*group);<br>
virCgroupFree(group);<br>
@@ -4198,8 +4198,8 @@ virCgroupPathOfController(virC<wbr>groupPtr group ATTRIBUTE_UNUSED,<br>
<br>
<br>
int<br>
-virCgroupAddTask(virCgroupPtr group ATTRIBUTE_UNUSED,<br>
- pid_t pid ATTRIBUTE_UNUSED)<br>
+virCgroupAddProcess(virCgroup<wbr>Ptr group ATTRIBUTE_UNUSED,<br>
+ pid_t pid ATTRIBUTE_UNUSED)<br>
{<br>
virReportSystemError(ENXIO, "%s",<br>
_("Control groups not supported on this platform"));<br>
@@ -4208,8 +4208,8 @@ virCgroupAddTask(virCgroupPtr group ATTRIBUTE_UNUSED,<br>
<br>
<br>
int<br>
-virCgroupAddMachineTask(virCg<wbr>roupPtr group ATTRIBUTE_UNUSED,<br>
- pid_t pid ATTRIBUTE_UNUSED)<br>
+virCgroupAddMachineProcess(vi<wbr>rCgroupPtr group ATTRIBUTE_UNUSED,<br>
+ pid_t pid ATTRIBUTE_UNUSED)<br>
{<br>
virReportSystemError(ENXIO, "%s",<br>
_("Control groups not supported on this platform"));<br>
diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h<br>
index ee3b7c7222..bbd4c2ed57 100644<br>
--- a/src/util/vircgroup.h<br>
+++ b/src/util/vircgroup.h<br>
@@ -118,8 +118,8 @@ int virCgroupPathOfController(virC<wbr>groupPtr group,<br>
const char *key,<br>
char **path);<br>
<br>
-int virCgroupAddTask(virCgroupPtr group, pid_t pid);<br>
-int virCgroupAddMachineTask(virCgr<wbr>oupPtr group, pid_t pid);<br>
+int virCgroupAddProcess(virCgroupP<wbr>tr group, pid_t pid);<br>
+int virCgroupAddMachineProcess(vir<wbr>CgroupPtr group, pid_t pid);<br>
<br>
int virCgroupSetBlkioWeight(virCgr<wbr>oupPtr group, unsigned int weight);<br>
int virCgroupGetBlkioWeight(virCgr<wbr>oupPtr group, unsigned int *weight);<br>
<span class="m_-2153243371387795793HOEnZb"><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>