[Xen-changelog] [xen-unstable] xend: Better support for legacy HVM config of ia64

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1218450460 -3600
# Node ID ce085fc0d2e423aa1c602ce117cc775b000470ba
# Parent  f10d436d9a9ef413135374e73b32659fc2da9cfb
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@xxxxxxxxxxxxxx>
Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r f10d436d9a9e -r ce085fc0d2e4 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Mon Aug 11 11:18:50 2008 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Mon Aug 11 11:27:40 2008 +0100
@@ -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:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog