ia64/xen-unstable

changeset 12243:6191a06b6ed6

merge.
author kfraser@localhost.localdomain
date Fri Nov 03 11:38:24 2006 +0000 (2006-11-03)
parents 2e8c68b0c973 5a291d87c334
children 044c6617e2be
files
line diff
     1.1 --- a/tools/python/xen/xend/XendConfig.py	Fri Nov 03 11:37:41 2006 +0000
     1.2 +++ b/tools/python/xen/xend/XendConfig.py	Fri Nov 03 11:38:24 2006 +0000
     1.3 @@ -702,7 +702,7 @@ class XendConfig(dict):
     1.4  
     1.5          # Fill in default values
     1.6          for key, default_func in DEFAULT_CONFIGURATION:
     1.7 -            if key not in self:
     1.8 +            if key not in self or self[key] == None:
     1.9                  self[key] = default_func(self)
    1.10  
    1.11          # Basic sanity checks
     2.1 --- a/tools/python/xen/xend/image.py	Fri Nov 03 11:37:41 2006 +0000
     2.2 +++ b/tools/python/xen/xend/image.py	Fri Nov 03 11:38:24 2006 +0000
     2.3 @@ -458,7 +458,7 @@ class HVMImageHandler(ImageHandler):
     2.4          xd = xen.xend.XendDomain.instance()
     2.5          vm = xd.domain_lookup( self.vm.getDomid() )
     2.6  
     2.7 -        reason = vm.readDom('control/shutdown')
     2.8 +        reason = vm._readDom('control/shutdown')
     2.9          log.debug("hvm_shutdown fired, shutdown reason=%s", reason)
    2.10          for x in shutdown_reasons.keys():
    2.11              if shutdown_reasons[x] == reason:
     3.1 --- a/tools/python/xen/xend/server/XMLRPCServer.py	Fri Nov 03 11:37:41 2006 +0000
     3.2 +++ b/tools/python/xen/xend/server/XMLRPCServer.py	Fri Nov 03 11:38:24 2006 +0000
     3.3 @@ -40,7 +40,7 @@ def fixup_sxpr(sexpr):
     3.4      return ret
     3.5  
     3.6  def lookup(domid):
     3.7 -    info = XendDomain.instance().domain_lookup_nr(domid)
     3.8 +    info = XendDomain.instance().domain_lookup(domid)
     3.9      if not info:
    3.10          raise XendInvalidDomain(str(domid))
    3.11      return info