提交 5c851562 编写于 作者: C Chen Fan 提交者: Martin Kletzander

virnuma: use virNumaNodesetIsAvailable checking nodeset in virNumaSetupMemoryPolicy

Signed-off-by: NChen Fan <chen.fan.fnst@cn.fujitsu.com>
上级 90286418
......@@ -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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册