ia64/xen-unstable

changeset 8293:cd434888abdc

Looks like someone merged and moved the pincpu operation to after the
memory reservation and didn't read the comments I left in the code:

# repin domain vcpus if a restricted cpus list is provided
# this is done prior to memory allocation to aide in memory
# distribution for NUMA systems.

This patch moves the pincpu op back to where it was.

Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
author emellor@leeni.uk.xensource.com
date Thu Dec 08 18:17:59 2005 +0000 (2005-12-08)
parents 2cc09c21cdba
children 3ab6a6c4b6ed
files tools/python/xen/xend/XendDomainInfo.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Thu Dec 08 16:58:41 2005 +0100
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Thu Dec 08 18:17:59 2005 +0000
     1.3 @@ -1171,11 +1171,6 @@ class XendDomainInfo:
     1.4  
     1.5              xc.domain_setcpuweight(self.domid, self.info['cpu_weight'])
     1.6  
     1.7 -            m = self.image.getDomainMemory(self.info['memory'] * 1024)
     1.8 -            balloon.free(m)
     1.9 -            xc.domain_setmaxmem(self.domid, m)
    1.10 -            xc.domain_memory_increase_reservation(self.domid, m, 0, 0)
    1.11 -
    1.12              # repin domain vcpus if a restricted cpus list is provided
    1.13              # this is done prior to memory allocation to aide in memory
    1.14              # distribution for NUMA systems.
    1.15 @@ -1186,6 +1181,11 @@ class XendDomainInfo:
    1.16                      cpu = [ int( cpus[v % len(cpus)] ) ]
    1.17                      xc.domain_pincpu(self.domid, v, cpu)
    1.18  
    1.19 +            m = self.image.getDomainMemory(self.info['memory'] * 1024)
    1.20 +            balloon.free(m)
    1.21 +            xc.domain_setmaxmem(self.domid, m)
    1.22 +            xc.domain_memory_increase_reservation(self.domid, m, 0, 0)
    1.23 +
    1.24              self.createChannels()
    1.25  
    1.26              channel_details = self.image.createImage()