From 3ca259a393756ab0a00ce0a332184d596b37b8b1 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 11 Aug 2008 11:27:40 +0100 Subject: [PATCH] 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 Signed-off-by: KUWAMURA Shin'ya Signed-off-by: Keir Fraser --- tools/python/xen/xend/XendConfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- 2.30.2