From 5c8515620bd63b4f9fd848fdad275922928975c7 Mon Sep 17 00:00:00 2001 From: Chen Fan Date: Tue, 4 Nov 2014 10:44:41 +0800 Subject: [PATCH] virnuma: use virNumaNodesetIsAvailable checking nodeset in virNumaSetupMemoryPolicy Signed-off-by: Chen Fan --- src/util/virnuma.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 2540bd256f..89435de607 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -98,16 +98,13 @@ virNumaSetupMemoryPolicy(virDomainNumatunePtr numatune, int maxnode = 0; virBitmapPtr tmp_nodemask = NULL; + if (!virNumaNodesetIsAvailable(numatune)) + return -1; + tmp_nodemask = virDomainNumatuneGetNodeset(numatune, nodemask, -1); if (!tmp_nodemask) return 0; - if (numa_available() < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Host kernel is not aware of NUMA.")); - return -1; - } - maxnode = numa_max_node(); maxnode = maxnode < NUMA_NUM_NODES ? maxnode : NUMA_NUM_NODES; @@ -347,12 +344,8 @@ int virNumaSetupMemoryPolicy(virDomainNumatunePtr numatune, virBitmapPtr nodemask ATTRIBUTE_UNUSED) { - if (virDomainNumatuneGetNodeset(numatune, NULL, -1)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("libvirt is compiled without NUMA tuning support")); - + if (!virNumaNodesetIsAvailable(numatune)) return -1; - } return 0; }