1.1 --- a/tools/python/xen/xend/XendDomain.py	Fri Sep 16 19:08:36 2005 +0000
     1.2 +++ b/tools/python/xen/xend/XendDomain.py	Fri Sep 16 19:11:39 2005 +0000
     1.3 @@ -155,7 +155,7 @@ class XendDomain:
     1.4          if not dom0:
     1.5              dom0 = self.domain_unknown(0)
     1.6          dom0.dom0_init_store()    
     1.7 -        dom0.dom0_enforce_cpus()
     1.8 +        dom0.dom0_enforce_vcpus()
     1.9  
    1.10      def close(self):
    1.11          pass

     2.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Fri Sep 16 19:08:36 2005 +0000
     2.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Fri Sep 16 19:11:39 2005 +0000
     2.3 @@ -1120,13 +1120,13 @@ class XendDomainInfo:
     2.4              # get run-time value of vcpus and update store
     2.5              self.configure_vcpus(dom_get(self.domid)['vcpus'])
     2.6  
     2.7 -    def dom0_enforce_cpus(self):
     2.8 +    def dom0_enforce_vcpus(self):
     2.9          dom = 0
    2.10 -        # get max number of cpus to use for dom0 from config
    2.11 +        # get max number of vcpus to use for dom0 from config
    2.12          from xen.xend import XendRoot
    2.13          xroot = XendRoot.instance()
    2.14 -        target = int(xroot.get_dom0_cpus())
    2.15 -        log.debug("number of cpus to use is %d" % (target))
    2.16 +        target = int(xroot.get_dom0_vcpus())
    2.17 +        log.debug("number of vcpus to use is %d" % (target))
    2.18     
    2.19          # target = 0 means use all processors
    2.20          if target > 0:

     3.1 --- a/tools/python/xen/xend/XendRoot.py	Fri Sep 16 19:08:36 2005 +0000
     3.2 +++ b/tools/python/xen/xend/XendRoot.py	Fri Sep 16 19:11:39 2005 +0000
     3.3 @@ -87,7 +87,7 @@ class XendRoot:
     3.4  
     3.5      dom0_min_mem_default = '0'
     3.6  
     3.7 -    dom0_cpus_default = '0'
     3.8 +    dom0_vcpus_default = '0'
     3.9  
    3.10      components = {}
    3.11  
    3.12 @@ -332,8 +332,8 @@ class XendRoot:
    3.13      def get_dom0_min_mem(self):
    3.14          return self.get_config_int('dom0-min-mem', self.dom0_min_mem_default)
    3.15  
    3.16 -    def get_dom0_cpus(self):
    3.17 -        return self.get_config_int('dom0-cpus', self.dom0_cpus_default)
    3.18 +    def get_dom0_vcpus(self):
    3.19 +        return self.get_config_int('dom0-cpus', self.dom0_vcpus_default)
    3.20  
    3.21  def instance():
    3.22      """Get an instance of XendRoot.