From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yosuke Iwamatsu <y-iwamatsu@ab.jp.nec.com>
Subject: [PATCH] Xend: Fix Setting up Platform Parameters
Date: Wed, 13 Aug 2008 21:06:36 +0900
Message-ID: <48A2CE4C.1080803@ab.jp.nec.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

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 -r 2c63cf7b042d tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py   Tue Aug 12 10:23:34 2008 +0100
+++ b/tools/python/xen/xend/XendConfig.py   Wed Aug 13 20:43:41 2008 +0900
@@ -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: