ia64/xen-unstable

changeset 15058:03b8e82b4a77

Merge
author Tim Deegan <Tim.Deegan@xensource.com>
date Tue May 08 10:32:38 2007 +0100 (2007-05-08)
parents 05b5b126eb4c 3ef0510e44d0
children d2ef85c6bf84
files
line diff
     1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Tue May 08 10:32:05 2007 +0100
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Tue May 08 10:32:38 2007 +0100
     1.3 @@ -867,7 +867,10 @@ class XendDomainInfo:
     1.4  
     1.5          # convert two lists into a python dictionary
     1.6          vm_details = dict(zip(cfg_vm, vm_details))
     1.7 -        
     1.8 +
     1.9 +        if vm_details['rtc/timeoffset'] == None:
    1.10 +            vm_details['rtc/timeoffset'] = "0"
    1.11 +
    1.12          for arg, val in vm_details.items():
    1.13              if arg in XendConfig.LEGACY_CFG_TO_XENAPI_CFG:
    1.14                  xapiarg = XendConfig.LEGACY_CFG_TO_XENAPI_CFG[arg]
     2.1 --- a/tools/python/xen/xend/image.py	Tue May 08 10:32:05 2007 +0100
     2.2 +++ b/tools/python/xen/xend/image.py	Tue May 08 10:32:38 2007 +0100
     2.3 @@ -418,7 +418,7 @@ class HVMImageHandler(ImageHandler):
     2.4              ret.append('-nographic')
     2.5  
     2.6          if int(vmConfig['platform'].get('monitor', 0)) != 0:
     2.7 -            ret.append('-monitor vc')
     2.8 +            ret = ret + ['-monitor', 'vc']
     2.9          return ret
    2.10  
    2.11      def createDeviceModel(self, restore = False):