<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">Use flags in virCgroupAddTaskInternal instead of boolean parameter.<br>
Following patch will ad new flag to indicate thread instead of process.<br></blockquote><div><br></div><div>typo: ad -> add<br></div><div> <br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Signed-off-by: Pavel Hrdina <<a href="mailto:phrdina@redhat.com" target="_blank">phrdina@redhat.com</a>> <br></blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
src/util/vircgroup.c | 19 +++++++++++++++----<br>
1 file changed, 15 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c<br>
index cf510fb019..1d361762c5 100644<br>
--- a/src/util/vircgroup.c<br>
+++ b/src/util/vircgroup.c<br>
@@ -1156,8 +1156,16 @@ virCgroupNew(pid_t pid,<br>
}<br>
<br>
<br>
+typedef enum {<br>
+ VIR_CGROUP_TASK_PROCESS = 0,<br>
+ VIR_CGROUP_TASK_SYSTEMD = 1 << 0,<br></blockquote><div><br></div><div>Although not strictly needed, would be nice to have a comment describing what the flags mean.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+} virCgroupTaskFlags;<br>
+<br>
+<br>
static int<br>
-virCgroupAddTaskInternal(virC<wbr>groupPtr group, pid_t pid, bool withSystemd)<br>
+virCgroupAddTaskInternal(virC<wbr>groupPtr group,<br>
+ pid_t pid,<br>
+ unsigned int flags)<br>
{<br>
int ret = -1;<br>
size_t i;<br>
@@ -1170,7 +1178,8 @@ virCgroupAddTaskInternal(virCg<wbr>roupPtr group, pid_t pid, bool withSystemd)<br>
/* We must never add tasks in systemd's hierarchy<br>
* unless we're intentionally trying to move a<br>
* task into a systemd machine scope */<br>
- if (i == VIR_CGROUP_CONTROLLER_SYSTEMD && !withSystemd)<br>
+ if (i == VIR_CGROUP_CONTROLLER_SYSTEMD &&<br>
+ !(flags & VIR_CGROUP_TASK_SYSTEMD))<br>
continue;<br>
<br>
if (virCgroupSetValueI64(group, i, "tasks", pid) < 0)<br>
@@ -1196,7 +1205,7 @@ virCgroupAddTaskInternal(virCg<wbr>roupPtr group, pid_t pid, bool withSystemd)<br>
int<br>
virCgroupAddProcess(virCgroup<wbr>Ptr group, pid_t pid)<br>
{<br>
- return virCgroupAddTaskInternal(group<wbr>, pid, false);<br>
+ return virCgroupAddTaskInternal(group<wbr>, pid, VIR_CGROUP_TASK_PROCESS);<br>
}<br>
<br>
/**<br>
@@ -1213,7 +1222,9 @@ virCgroupAddProcess(virCgroupP<wbr>tr group, pid_t pid)<br>
int<br>
virCgroupAddMachineProcess(vi<wbr>rCgroupPtr group, pid_t pid)<br>
{<br>
- return virCgroupAddTaskInternal(group<wbr>, pid, true);<br>
+ return virCgroupAddTaskInternal(group<wbr>, pid,<br>
+ VIR_CGROUP_TASK_PROCESS |<br>
+ VIR_CGROUP_TASK_SYSTEMD);<br>
}<br>
<span class="m_6968344273066942057HOEnZb"><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></div><div class="gmail_extra"><br></div><div class="gmail_extra">Reviewed-by: Fabiano Fidêncio <<a href="mailto:fidencio@redhat.com" target="_blank">fidencio@redhat.com</a>><br></div></div>