xend: move pincpu op before memory op again
PATCH 1/1 xend: move pincpu op before memory op again
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.
Signature · 39 lines
Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx (512) 838-9253 T/L: 678-9253 [email protected] diffstat output: XendDomainInfo.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) Signed-off-by: Ryan Harper <[email protected]> --- diff -r 5f574f9cb4bd tools/python/xen/xend/XendDomainInfo.py --- a/tools/python/xen/xend/XendDomainInfo.py Wed Dec 7 11:57:26 2005 +++ b/tools/python/xen/xend/XendDomainInfo.py Thu Dec 8 11:42:26 2005 @@ -1165,11 +1165,6 @@ xc.domain_setcpuweight(self.domid, self.info['cpu_weight']) - m = self.image.getDomainMemory(self.info['memory'] * 1024) - balloon.free(m) - xc.domain_setmaxmem(self.domid, m) - xc.domain_memory_increase_reservation(self.domid, m, 0, 0) - # 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. @@ -1179,6 +1174,11 @@ # pincpu takes a list of ints cpu = [ int( cpus[v % len(cpus)] ) ] xc.domain_pincpu(self.domid, v, cpu) + + m = self.image.getDomainMemory(self.info['memory'] * 1024) + balloon.free(m) + xc.domain_setmaxmem(self.domid, m) + xc.domain_memory_increase_reservation(self.domid, m, 0, 0) self.createChannels()
Quoted 8 lines · Ryan Harper
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.
D'oh! Sorry. Applied.
Ewan.