diff options
| author | Tim Deegan <Tim.Deegan@xensource.com> | 2007-05-08 10:32:38 +0100 |
|---|---|---|
| committer | Tim Deegan <Tim.Deegan@xensource.com> | 2007-05-08 10:32:38 +0100 |
| commit | 1b542cb692646359209c4689db686dd3f5f65361 (patch) | |
| tree | 2de84236ea30d03345062074e30c0251a974c39e | |
| parent | b672b7a5c4860904a464f06cf23dde59cc8d4fd9 (diff) | |
| parent | 2f7f40357b5f68b0bb278d72c82bf4f4fa0aede7 (diff) | |
| download | xen-1b542cb692646359209c4689db686dd3f5f65361.tar.gz xen-1b542cb692646359209c4689db686dd3f5f65361.tar.bz2 xen-1b542cb692646359209c4689db686dd3f5f65361.zip | |
Merge
| -rw-r--r-- | tools/python/xen/xend/XendDomainInfo.py | 5 | ||||
| -rw-r--r-- | tools/python/xen/xend/image.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index f1c602a2d7..5c16baf6e7 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -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 --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index d1ea10fe0c..bec78012e0 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -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): |