diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-08-11 11:27:40 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-08-11 11:27:40 +0100 |
| commit | 3ca259a393756ab0a00ce0a332184d596b37b8b1 (patch) | |
| tree | 7473b16a6e2a1845dcfa80da6c5cf480905d2c48 | |
| parent | b87e597231d4d625ee570003cb18efad5c0ae05c (diff) | |
| download | xen-3ca259a393756ab0a00ce0a332184d596b37b8b1.tar.gz xen-3ca259a393756ab0a00ce0a332184d596b37b8b1.tar.bz2 xen-3ca259a393756ab0a00ce0a332184d596b37b8b1.zip | |
xend: Better support for legacy HVM config of ia64
On ia64, direct Linux boot is not supported, and 'Flash.fd' or
'guest_firmware.bin' has been used as a value of the 'kernel'
option. Cset:17016 ignores those strings and overrides them with
"/usr/lib/xen/boot/hvmloader".
Signed-off-by: Kazuhiro Suzuki <kaz@jp.fujitsu.com>
Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
| -rw-r--r-- | tools/python/xen/xend/XendConfig.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index 484621970d..afc8cd3caf 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -448,7 +448,7 @@ class XendConfig(dict): self['platform']['hpet'] = 0 if 'loader' not in self['platform']: # Old configs may have hvmloader set as PV_kernel param - if self.has_key('PV_kernel') and re.search('hvmloader', self['PV_kernel']): + if self.has_key('PV_kernel'): self['platform']['loader'] = self['PV_kernel'] self['PV_kernel'] = '' else: |