Xend: Fix Setting up Platform Parameters

PATCH In review Yosuke Iwamatsu 2 participants 3 messages Aug 13, 2008

Share & tools

Yosuke Iwamatsu

author

2008-08-13 12:06 UTC #0 lore raw

PATCH 1/1 Xend: Fix Setting up Platform Parameters

Make sure that 'PV_kernel' config param is not blank when assigning it to 'loader' param. This fixes a failure of 'xm create' via xen-api.

Signed-off-by Yosuke Iwamatsu <[email protected]>

tools/python/xen/xend/XendConfig.py Wed Aug 13 20:43:41 2008 +0900 renamed from tools/python/xen/xend/XendConfig.py Tue Aug 12 10:23:34 2008 +0100 +1 -1

diff -r 2c63cf7b042d 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'):
+                if self.has_key('PV_kernel') and self['PV_kernel'] != '':
                     self['platform']['loader'] = self['PV_kernel']
                     self['PV_kernel'] = ''
                 else:

Keir Fraser

2008-08-13 12:29 UTC #1 lore raw

So setting self['platform']['loader'] to '' instead of None can break booting? How?

-- Keir

Quoted 22 lines · Yosuke Iwamatsu

Make sure that 'PV_kernel' config param is not blank when assigning it to 'loader' param. This fixes a failure of 'xm create' via xen-api.
Signed-off-by Yosuke Iwamatsu <[email protected]>
diff -r 2c63cf7b042d tools/python/xen/xend/XendConfig.py
tools/python/xen/xend/XendConfig.py Wed Aug 13 20:43:41 2008 +0900 renamed from tools/python/xen/xend/XendConfig.py Tue Aug 12 10:23:34 2008 +0100 +1 -1
@@ -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'):
+                if self.has_key('PV_kernel') and self['PV_kernel'] != '':
                     self['platform']['loader'] = self['PV_kernel']
                     self['PV_kernel'] = ''
                 else:
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Keir Fraser

2008-08-13 12:34 UTC #2 lore raw

Oh sorry, I see why the patch is needed now.

-- Keir

Quoted 36 lines · Keir Fraser

So setting self['platform']['loader'] to '' instead of None can break booting? How?
-- Keir
Quoted 18 lines · Yosuke Iwamatsu
Make sure that 'PV_kernel' config param is not blank when assigning it to 'loader' param. This fixes a failure of 'xm create' via xen-api.
Signed-off-by Yosuke Iwamatsu <[email protected]>
diff -r 2c63cf7b042d tools/python/xen/xend/XendConfig.py
tools/python/xen/xend/XendConfig.py Wed Aug 13 20:43:41 2008 +0900 renamed from tools/python/xen/xend/XendConfig.py Tue Aug 12 10:23:34 2008 +0100 +1 -1
@@ -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'):
+                if self.has_key('PV_kernel') and self['PV_kernel'] != '':
                     self['platform']['loader'] = self['PV_kernel']
                     self['PV_kernel'] = ''
                 else:
Quoted 4 lines
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel