From c9a3c9693ff36f338e35c5bfeb4042dd30839577 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 24 Mar 2016 19:59:57 +0100
Subject: [vmware] Don't enable VT-x virtualization until we know how to check
 for support

---
 .../data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
index 1c7aa533..a77bc171 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
@@ -128,10 +128,11 @@ if [ -n "$SLX_EXAM" ]; then
 fi
 
 # Enable nested virtualization if not specified in remote vmx
-if [ -e "/run/hwinfo" ] && ! grep -qi '^vhv\.enable' "${TMPDIR}/${IMGUUID}"; then
-	. "/run/hwinfo"
-	[ "${HW_KVM}" = "ENABLED" ] && echo 'vhv.enable = "TRUE"' >> "${TMPDIR}/${IMGUUID}"
-fi
+# TODO: Some CPUs don't support VT-x nesting. Disabled until we know how to check this
+#if [ -e "/run/hwinfo" ] && ! grep -qi '^vhv\.enable' "${TMPDIR}/${IMGUUID}"; then
+#	. "/run/hwinfo"
+#	[ "${HW_KVM}" = "ENABLED" ] && echo 'vhv.enable = "TRUE"' >> "${TMPDIR}/${IMGUUID}"
+#fi
 # TODO: Need a way to check if supported by hardware before enabling!
 #grep -qi '^vpmc\.enable' "${TMPDIR}/${IMGUUID}" || echo 'vpmc.enable = "TRUE"' >> "${TMPDIR}/${IMGUUID}"
 
-- 
cgit v1.2.3-55-g7522