From 8a3844f8189af257ff3f5aa298eda55b73f2a4d3 Mon Sep 17 00:00:00 2001 From: Wang Rui Date: Mon, 10 Nov 2014 21:53:18 +0800 Subject: [PATCH] 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 --- src/lxc/lxc_cgroup.c | 4 ++++ 1 file changed, 4 insertions(+) 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;