[Xen-changelog] [xen-unstable] avoid numa placement of cpus with active cpupools

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Juergen Gross <juergen.gross@xxxxxxxxxxxxxx>
# Date 1288264929 -3600
# Node ID dc66c13a29f9af67e0258f688bcd6330cf515383
# Parent  4ac03710fc320e8f76014ca27849da03b85dff9d
avoid numa placement of cpus with active cpupools

When using cpupools don't pin vcpus to numa nodes as this might
conflict with the cpupool definition.
numa placement should be handled by cpupool configuration instead.

Signed-off-by: Juergen Gross <juergen.gross@xxxxxxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendCPUPool.py    |    5 +++++
 tools/python/xen/xend/XendDomainInfo.py |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff -r 4ac03710fc32 -r dc66c13a29f9 tools/python/xen/xend/XendCPUPool.py
--- a/tools/python/xen/xend/XendCPUPool.py      Thu Oct 28 12:19:43 2010 +0100
+++ b/tools/python/xen/xend/XendCPUPool.py      Thu Oct 28 12:22:09 2010 +0100
@@ -883,6 +883,11 @@ class XendCPUPool(XendBase):
     lookup_pool = classmethod(lookup_pool)
 
 
+    def number_of_pools(cls):
+        return len(xc.cpupool_getinfo())
+
+    number_of_pools = classmethod(number_of_pools)
+
     def _cpu_number_to_ref(cls, number):
         node = XendNode.instance()
         for cpu_ref in node.get_host_cpu_refs():
diff -r 4ac03710fc32 -r dc66c13a29f9 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Thu Oct 28 12:19:43 2010 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py   Thu Oct 28 12:22:09 2010 +0100
@@ -2748,7 +2748,7 @@ class XendDomainInfo:
                 return map(lambda x: x[0], sorted(enumerate(nodeload), 
key=lambda x:x[1]))
 
             info = xc.numainfo()
-            if info['max_node_index'] > 0:
+            if info['max_node_index'] > 0 and  XendCPUPool.number_of_pools() < 
2:
                 node_memory_list = info['node_memfree']
                 node_to_cpu = []
                 for i in range(0, info['max_node_index'] + 1):

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog