[Xen-changelog] [xen-3.1-testing] Merge

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1178616758 -3600
# Node ID 03b8e82b4a77712582c5882bf42baf9b90052626
# Parent  05b5b126eb4c3b0d9b6739f62e8489d57e19a1ef
# Parent  3ef0510e44d04eb837ae238203251b969fc45df9
Merge
---
 tools/python/xen/xend/XendDomainInfo.py |    5 ++++-
 tools/python/xen/xend/image.py          |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff -r 05b5b126eb4c -r 03b8e82b4a77 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Tue May 08 10:32:05 2007 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py   Tue May 08 10:32:38 2007 +0100
@@ -867,7 +867,10 @@ class XendDomainInfo:
 
         # convert two lists into a python dictionary
         vm_details = dict(zip(cfg_vm, vm_details))
-        
+
+        if vm_details['rtc/timeoffset'] == None:
+            vm_details['rtc/timeoffset'] = "0"
+
         for arg, val in vm_details.items():
             if arg in XendConfig.LEGACY_CFG_TO_XENAPI_CFG:
                 xapiarg = XendConfig.LEGACY_CFG_TO_XENAPI_CFG[arg]
diff -r 05b5b126eb4c -r 03b8e82b4a77 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Tue May 08 10:32:05 2007 +0100
+++ b/tools/python/xen/xend/image.py    Tue May 08 10:32:38 2007 +0100
@@ -418,7 +418,7 @@ class HVMImageHandler(ImageHandler):
             ret.append('-nographic')
 
         if int(vmConfig['platform'].get('monitor', 0)) != 0:
-            ret.append('-monitor vc')
+            ret = ret + ['-monitor', 'vc']
         return ret
 
     def createDeviceModel(self, restore = False):

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