[Xen-changelog] Merge.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 92c6021f23e4bb7fe1254f21d6a24d07d62f0e54
# Parent  7b95474857033e638236ec66d9d098eb7928aee5
# Parent  10c93f58b041b129351b33854fa7f46a7527a026
Merge.

diff -r 7b9547485703 -r 92c6021f23e4 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Thu Oct 13 14:25:42 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py   Thu Oct 13 14:26:44 2005
@@ -1012,6 +1012,8 @@
         # 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',
@@ -1030,9 +1032,6 @@
             self.image.handleBootloading()
 
         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'])

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog