From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 1 Oct 2013 13:47:08 +0000 (-0400)
Subject: rcS: Use 'xm' for Xen 4.2 as 'xl' has issues with save/restore
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ca3ea22325471ef0c4cc4e412360f0ab667ca13e;p=xentesttools%2Fbootstrap.git

rcS: Use 'xm' for Xen 4.2 as 'xl' has issues with save/restore

of PVHVM guests.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/root_image/etc/init.d/rcS b/root_image/etc/init.d/rcS
index 9ba8765..17ced11 100755
--- a/root_image/etc/init.d/rcS
+++ b/root_image/etc/init.d/rcS
@@ -102,7 +102,9 @@ if [ $XEND_LOAD -eq 1 ]; then
 		/etc/init.d/xencommons start
 	fi
 	# Xen 4.2 and above should use 'xl' instead of 'xm'
-	if [ "$XEN_VERSION" -lt 42 ]; then
+	# But Xen 4.2 has busted 'xl' when it comes to save/restore
+	# of PVHVM guests, so lets just skip it and use 'xm'.
+	if [ "$XEN_VERSION" -lt 43 ]; then
 		/etc/init.d/xend start
 	else
 		echo "run_hotplug_scripts=0" >> /etc/xen/xl.conf