From 53eae3e7c35aa04402072a39f724b0d9d0b3e8be Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 27 Mar 2015 15:16:43 +0100 Subject: [PATCH] qemuDomainGetNumaParameters: Check for the correct CGroup controller 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 --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f07e4fb80..4d0522106 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -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); -- 2.39.5