33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
# HG changeset patch
|
|
# User Keir Fraser <keir.fraser@citrix.com>
|
|
# Date 1205838353 0
|
|
# Node ID 939ceafa5ef9244829b7347a0338002c7ae1a8a0
|
|
# Parent 2ed94b9b10b3770d7bfd7346f532b70e70be35c1
|
|
Initialization of new domU config options via XenAPI
|
|
|
|
Many of the new domU config options related to hvm guests (e.g. hpet,
|
|
rtc_timeoffset, etc.) are not initialized with default values via
|
|
XenAPI, which prevents starting an hvm domU created through XenAPI.
|
|
This patch ensures the new options are set with appropriate default
|
|
values in XendConfig platform sanity check.
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@novell.com>
|
|
|
|
Index: xen-3.2-testing/tools/python/xen/xend/XendConfig.py
|
|
===================================================================
|
|
--- xen-3.2-testing.orig/tools/python/xen/xend/XendConfig.py
|
|
+++ xen-3.2-testing/tools/python/xen/xend/XendConfig.py
|
|
@@ -403,6 +403,12 @@ class XendConfig(dict):
|
|
self['platform']['device_model'] = xen.util.auxbin.pathTo("qemu-dm")
|
|
|
|
if self.is_hvm():
|
|
+ if 'timer_mode' not in self['platform']:
|
|
+ self['platform']['timer_mode'] = 0
|
|
+ if 'rtc_timeoffset' not in self['platform']:
|
|
+ self['platform']['rtc_timeoffset'] = 0
|
|
+ if 'hpet' not in self['platform']:
|
|
+ self['platform']['hpet'] = 0
|
|
# Compatibility hack, can go away soon.
|
|
if 'soundhw' not in self['platform'] and \
|
|
self['platform'].get('enable_audio'):
|