[Xen-changelog] [xen-unstable] xend: Make sure that 'PV_kernel' config param is not blank when

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1218631238 -3600
# Node ID 60af813ea4589fd7006eb001c2ee6cef90c639ac
# Parent  29c242c06ac2b86eef9e3c41ee5b8bfc740dd0bc
xend: 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 <y-iwamatsu@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 29c242c06ac2 -r 60af813ea458 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Wed Aug 13 13:39:40 2008 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Wed Aug 13 13:40:38 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'):
+                if self.has_key('PV_kernel') and self['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