[Xen-ia64-devel] xend: Better support for legacy HVM config of ia64

["KUWAMURA Shin'ya" <kuwa@xxxxxxxxxxxxxx>]

Hi,

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

We tested on x86_64 and ia64 with old and new configs.

Signed-off-by: Kazuhiro Suzuki <kaz@xxxxxxxxxxxxxx>
Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
-- 
  KUWAMURA Shin'ya

# HG changeset patch
# User KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
# Date 1218441318 -32400
# Node ID f5faa2bb753a9e09fcd1e30c87c5fb512d37db86
# Parent  4e3316ed1af512bd14a2ef975455cee6168f4bec
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>

diff -r 4e3316ed1af5 -r f5faa2bb753a tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Fri Aug 08 15:02:19 2008 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Mon Aug 11 16:55:18 2008 +0900
@@ -447,12 +447,13 @@ class XendConfig(dict):
             if 'hpet' not in self['platform']:
                 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 not self.has_key('PV_kernel'):
+                    self['platform']['loader'] = "/usr/lib/xen/boot/hvmloader"
+                else:
+                    # Old configs may have hvmloader set as PV_kernel param
                     self['platform']['loader'] = self['PV_kernel']
-                    self['PV_kernel'] = ''
-                else:
-                    self['platform']['loader'] = "/usr/lib/xen/boot/hvmloader"
+                    if re.search('hvmloader', self['PV_kernel']):
+                        self['PV_kernel'] = ''
                 log.debug("Loader is %s" % str(self['platform']['loader']))
 
             # Compatibility hack, can go away soon.

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