ia64/xen-unstable
changeset 7379:92c6021f23e4
Merge.
author | emellor@leeni.uk.xensource.com |
---|---|
date | Thu Oct 13 15:26:44 2005 +0100 (2005-10-13) |
parents | 7b9547485703 10c93f58b041 |
children | 5a97ee0633e8 cd6f7b548218 |
files |
line diff
1.1 --- a/tools/python/xen/xend/XendDomainInfo.py Thu Oct 13 15:25:42 2005 +0100 1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py Thu Oct 13 15:26:44 2005 +0100 1.3 @@ -1012,6 +1012,8 @@ class XendDomainInfo: 1.4 # shutdown_start_time from killing the domain, for example. 1.5 self.removeDom() 1.6 1.7 + # Set maximum number of vcpus in domain 1.8 + xc.domain_max_vcpus(self.domid, int(self.info['vcpus'])) 1.9 1.10 def initDomain(self): 1.11 log.debug('XendDomainInfo.initDomain: %s %s %s', 1.12 @@ -1031,9 +1033,6 @@ class XendDomainInfo: 1.13 1.14 xc.domain_setcpuweight(self.domid, self.info['cpu_weight']) 1.15 1.16 - # Set maximum number of vcpus in domain 1.17 - xc.domain_max_vcpus(self.domid, int(self.info['vcpus'])); 1.18 - 1.19 # XXX Merge with configure_maxmem? 1.20 m = self.image.getDomainMemory(self.info['memory_KiB']) 1.21 xc.domain_setmaxmem(self.domid, m)