]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemuDomainGetNumaParameters: Check for the correct CGroup controller
authorMichal Privoznik <mprivozn@redhat.com>
Fri, 27 Mar 2015 14:16:43 +0000 (15:16 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 30 Mar 2015 13:20:34 +0000 (15:20 +0200)
When getting info on NUMA parameters for domain,
virCgroupGetCpusetMems() may be called. However, as of 43b67f2e
the call is guarded by check if memory controller is present.
Even though it may be not obvious instantly, NUMA parameters are
stored under cpuset controller. Therefore the check needs to look
like this:

  if (!virCgroupHasController(priv->cgroup,
                              VIR_CGROUP_CONTROLLER_CPUSET) ||
      virCgroupGetCpusetMems(priv->cgroup, &nodeset) < 0) {

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_driver.c

index f07e4fb80e2a7a6d95991cba8fa6a7ea9d044d7d..4d0522106808827f5925ab6e7c396ec88db0bb8b 100644 (file)
@@ -10187,7 +10187,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom,
                     goto cleanup;
             } else {
                 if (!virCgroupHasController(priv->cgroup,
-                                            VIR_CGROUP_CONTROLLER_MEMORY) ||
+                                            VIR_CGROUP_CONTROLLER_CPUSET) ||
                     virCgroupGetCpusetMems(priv->cgroup, &nodeset) < 0) {
                     nodeset = virDomainNumatuneFormatNodeset(vm->def->numa,
                                                              NULL, -1);