[Xen-changelog] [xen-unstable] merge.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 6191a06b6ed6e3641bb296ebdaa9c19ef0c64033
# Parent  2e8c68b0c973f3b26b8e48e6e097834a97fafb43
# Parent  5a291d87c33475850cea8895cc3dfa45f41bab40
merge.
---
 tools/python/xen/xend/XendConfig.py          |    2 +-
 tools/python/xen/xend/image.py               |    2 +-
 tools/python/xen/xend/server/XMLRPCServer.py |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff -r 2e8c68b0c973 -r 6191a06b6ed6 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Fri Nov 03 11:37:41 2006 +0000
+++ b/tools/python/xen/xend/XendConfig.py       Fri Nov 03 11:38:24 2006 +0000
@@ -702,7 +702,7 @@ class XendConfig(dict):
 
         # Fill in default values
         for key, default_func in DEFAULT_CONFIGURATION:
-            if key not in self:
+            if key not in self or self[key] == None:
                 self[key] = default_func(self)
 
         # Basic sanity checks
diff -r 2e8c68b0c973 -r 6191a06b6ed6 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Fri Nov 03 11:37:41 2006 +0000
+++ b/tools/python/xen/xend/image.py    Fri Nov 03 11:38:24 2006 +0000
@@ -458,7 +458,7 @@ class HVMImageHandler(ImageHandler):
         xd = xen.xend.XendDomain.instance()
         vm = xd.domain_lookup( self.vm.getDomid() )
 
-        reason = vm.readDom('control/shutdown')
+        reason = vm._readDom('control/shutdown')
         log.debug("hvm_shutdown fired, shutdown reason=%s", reason)
         for x in shutdown_reasons.keys():
             if shutdown_reasons[x] == reason:
diff -r 2e8c68b0c973 -r 6191a06b6ed6 
tools/python/xen/xend/server/XMLRPCServer.py
--- a/tools/python/xen/xend/server/XMLRPCServer.py      Fri Nov 03 11:37:41 
2006 +0000
+++ b/tools/python/xen/xend/server/XMLRPCServer.py      Fri Nov 03 11:38:24 
2006 +0000
@@ -40,7 +40,7 @@ def fixup_sxpr(sexpr):
     return ret
 
 def lookup(domid):
-    info = XendDomain.instance().domain_lookup_nr(domid)
+    info = XendDomain.instance().domain_lookup(domid)
     if not info:
         raise XendInvalidDomain(str(domid))
     return info

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