From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 10 Feb 2015 17:06:33 +0000 (-0500)
Subject: rcS/inittab: xen-detect under Haswell for PV guests report it as HVM
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e83701acf4ee2d5dd97c1ced612ba02f5bbfdfa7;p=xentesttools%2Fbootstrap.git

rcS/inittab: xen-detect under Haswell for PV guests report it as HVM

which means we put in inittab 'ttyS0' - but we want 'hvc0'.
Do one more test for console=hvc0 and if that is found
assume PV.

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 8be0279..df6eff4 100755
--- a/root_image/etc/init.d/rcS
+++ b/root_image/etc/init.d/rcS
@@ -86,10 +86,15 @@ echo "*.*     /var/log/messages" >> /etc/syslog.conf
 XEND_LOAD=0
 if [ -e /sys/hypervisor/type ]; then
 	if [ `cat /sys/hypervisor/type` == "xen" ]; then
+		# Haswell and later for PV will present it as 'HVM'
 		xen-detect -H
 		if [ $? -ne 0 ]; then
 			XEND_LOAD=1
 		fi
+		grep -q hvc0 /proc/cmdline
+		if [ $? -eq 0 ]; then
+			XEND_LOAD=1
+		fi
 	fi
 fi