# HG changeset patch # User cl349@freefall.cl.cam.ac.uk # Date 1097614557 0 # Node ID 5acf9e0cea1dfd691368ff81f682e19adbb6fa90 # Parent 98b7d1c6a2f7a29b0184c04c9f19d31e8232264b# Parent 9986cab328b79d1d2b8ed4bb5c2dbae092812320 bitkeeper revision 1.1159.1.225 (416c44ddiCKoVV9fskpXqECTuDVuvQ) Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-26dom0 diff -r 98b7d1c6a2f7 -r 5acf9e0cea1d tools/python/xen/xend/XendDomainInfo.py --- a/tools/python/xen/xend/XendDomainInfo.py Tue Oct 12 17:25:11 2004 +0000 +++ b/tools/python/xen/xend/XendDomainInfo.py Tue Oct 12 20:55:57 2004 +0000 @@ -439,6 +439,9 @@ class XendDomainInfo: self.memory = int(sxp.child_value(config, 'memory')) if self.memory is None: raise VmError('missing memory size') + cpu = sxp.child_value(config, 'cpu') + if self.dom and cpu is not None: + xc.domain_pincpu(self.dom, int(cpu)) self.init_domain() self.configure_console()