From: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
Date: Tue, 21 Jul 2009 22:04:24 +0000 (+0100)
Subject: fix empty kernel issue in hvm mode
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=64d1f416d25bc3ee08b6310c35708ba8f5c95a64;p=xenclient%2Ftoolstack.git

fix empty kernel issue in hvm mode

use to be filled in the config reading mechanism. Got lost during the
reorganization of the dynamic argument setting.
---

diff --git a/xenvm/vmact.ml b/xenvm/vmact.ml
index 51a2552..38d1408 100644
--- a/xenvm/vmact.ml
+++ b/xenvm/vmact.ml
@@ -425,6 +425,7 @@ let create_vm xc xs state =
 	)
 
 let build_info_of_cfg cfg =
+	let kernel = if cfg.hvm && cfg.kernel = "" then "/usr/lib/xen/boot/hvmloader" else cfg.kernel in
 	let spec_info =
 		match cfg.hvm with
 		| true  ->
@@ -455,7 +456,7 @@ let build_info_of_cfg cfg =
 	{
 		Domain.memory_max = cfg.memory;
 		Domain.memory_target = cfg.memory;
-		Domain.kernel = cfg.kernel;
+		Domain.kernel = kernel;
 		Domain.vcpus = cfg.vcpus;
 		Domain.priv = spec_info;
 	}