From: Wang Rui <moon.wangrui@huawei.com>
Date: Mon, 10 Nov 2014 13:53:18 +0000 (+0800)
Subject: lxc: don't setup cpuset.mems if memory mode in numatune is not 'strict'
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8a3844f8189af257ff3f5aa298eda55b73f2a4d3;p=libvirt.git

lxc: don't setup cpuset.mems if memory mode in numatune is not 'strict'

If the memory mode in numatune is not 'strict', we should not setup
cpuset.mems. Before commit 1a7be8c600905aa07ac2d78293336ba8523ad48e
we have checked the memory mode in virDomainNumatuneGetNodeset. This
patch adds the check as before.

Signed-off-by: Wang Rui <moon.wangrui@huawei.com>
---

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index f9af31cc84..eb67191304 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -79,6 +79,10 @@ static int virLXCCgroupSetupCpusetTune(virDomainDefPtr def,
             goto cleanup;
     }
 
+    if (virDomainNumatuneGetMode(def->numatune, -1) !=
+        VIR_DOMAIN_NUMATUNE_MEM_STRICT)
+        goto cleanup;
+
     if (virDomainNumatuneMaybeFormatNodeset(def->numatune, nodemask,
                                             &mask, -1) < 0)
         goto cleanup;