From: John Ferlan <jferlan@redhat.com>
Date: Tue, 22 Dec 2015 14:46:01 +0000 (-0500)
Subject: cgroup: Fix possible bug as a result of code motion for vcpu cgroup setup
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d6d7e2885badc24e224265283fd59f4c1c492ff9;p=libvirt.git

cgroup: Fix possible bug as a result of code motion for vcpu cgroup setup

Commit id '90b721e43' moved where the virCgroupAddTask was made until
after the check for the vcpupin checks. However, in doing so it missed
an option where if the cpumap didn't exist, then the code would continue
back to the top of the current vcpu loop. The results was that the
virCgroupAddTask wouldn't be called.

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 94b931fb48..e41f4617c4 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -1079,10 +1079,7 @@ qemuSetupCgroupForVcpu(virDomainObjPtr vm)
                 }
             }
 
-            if (!cpumap)
-                continue;
-
-            if (qemuSetupCgroupCpusetCpus(cgroup_vcpu, cpumap) < 0)
+            if (cpumap && qemuSetupCgroupCpusetCpus(cgroup_vcpu, cpumap) < 0)
                 goto cleanup;
         }