From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 13 Aug 2008 12:40:38 +0000 (+0100)
Subject: xend: Make sure that 'PV_kernel' config param is not blank when
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14157^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=74f9ac9665312dea0796f56e4366535680b5c9c7;p=xen.git

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@ab.jp.nec.com>
---

diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py
index afc8cd3caf..c49bfd8a79 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'):
+                if self.has_key('PV_kernel') and self['PV_kernel'] != '':
                     self['platform']['loader'] = self['PV_kernel']
                     self['PV_kernel'] = ''
                 else: