<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">If virCgroupEnableMissingControll<wbr>ers() fails it could already create<br>
some directories, we should clean it up as well.<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/util/vircgroup.c | 25 +++++++++++++++----------<br>
 1 file changed, 15 insertions(+), 10 deletions(-)<br>
<br>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c<br>
index 64507bf8aa..6aa30a82be 100644<br>
--- a/src/util/vircgroup.c<br>
+++ b/src/util/vircgroup.c<br>
@@ -1555,6 +1555,7 @@ virCgroupNewMachineSystemd(con<wbr>st char *name,<br>
     int rv;<br>
     virCgroupPtr init;<br>
     VIR_AUTOFREE(char *) path = NULL;<br>
+    virErrorPtr saved = NULL;<br>
<br>
     VIR_DEBUG("Trying to setup machine '%s' via systemd", name);<br>
     if ((rv = virSystemdCreateMachine(name,<br>
@@ -1588,20 +1589,24 @@ virCgroupNewMachineSystemd(con<wbr>st char *name,<br>
<br>
     if (virCgroupEnableMissingControl<wbr>lers(path, pidleader,<br>
                                           controllers, group) < 0) {<br>
-        return -1;<br>
+        goto error;<br>
     }<br>
<br>
-    if (virCgroupAddTask(*group, pidleader) < 0) {<br>
-        virErrorPtr saved = virSaveLastError();<br>
-        virCgroupRemove(*group);<br>
-        virCgroupFree(group);<br>
-        if (saved) {<br>
-            virSetError(saved);<br>
-            virFreeError(saved);<br>
-        }<br>
-    }<br>
+    if (virCgroupAddTask(*group, pidleader) < 0)<br>
+        goto error;<br>
<br>
     return 0;<br>
+<br>
+ error:<br>
+    saved = virSaveLastError();<br>
+    virCgroupRemove(*group);<br>
+    virCgroupFree(group);<br>
+    if (saved) {<br>
+        virSetError(saved);<br>
+        virFreeError(saved);<br>
+    }<br>
+<br>
+    return -1;<br>
 }<br>
<span class="m_-7043381257309748674HOEnZb"><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>