From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 11 Aug 2008 10:27:40 +0000 (+0100)
Subject: xend: Better support for legacy HVM config of ia64
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14157^2~18
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3ca259a393756ab0a00ce0a332184d596b37b8b1;p=xen.git

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>
---

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: