mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 02:30:03 +01:00
Merge.
This commit is contained in:
emellor@leeni.uk.xensource.com committed
commit
633d294bb5
1 file changed
+2
-3
@@ -1012,6 +1012,8 @@ class XendDomainInfo:
|
||||
# shutdown_start_time from killing the domain, for example.
|
||||
self.removeDom()
|
||||
|
||||
# Set maximum number of vcpus in domain
|
||||
xc.domain_max_vcpus(self.domid, int(self.info['vcpus']))
|
||||
|
||||
def initDomain(self):
|
||||
log.debug('XendDomainInfo.initDomain: %s %s %s',
|
||||
@@ -1031,9 +1033,6 @@ class XendDomainInfo:
|
||||
|
||||
xc.domain_setcpuweight(self.domid, self.info['cpu_weight'])
|
||||
|
||||
# Set maximum number of vcpus in domain
|
||||
xc.domain_max_vcpus(self.domid, int(self.info['vcpus']));
|
||||
|
||||
# XXX Merge with configure_maxmem?
|
||||
m = self.image.getDomainMemory(self.info['memory_KiB'])
|
||||
xc.domain_setmaxmem(self.domid, m)
|
||||
|
||||