From: Vinod Pademar <vinod.pademar@citrix.com>
Date: Thu, 12 Nov 2015 14:14:18 +0000 (+0000)
Subject: CA-188578 - Not running on VMX hardware
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=346a75ae5b58fe3d079e05e5100f4afedbc02e69;p=xenrt-citrix%2Fxenrt.git

CA-188578 - Not running on VMX hardware
---

diff --git a/exec/xenrt/lib/xenserver/host.py b/exec/xenrt/lib/xenserver/host.py
index d8abb14bd..8d8124f03 100755
--- a/exec/xenrt/lib/xenserver/host.py
+++ b/exec/xenrt/lib/xenserver/host.py
@@ -3375,18 +3375,18 @@ fi
     def isSvmHardware(self):
         """Return True if host is HVM compatible and has SVM enabled"""
         if isinstance(self, xenrt.lib.xenserver.BostonHost):
-            return self.isHvmEnabled() and "svm" in self.getHostParam("cpu_info")
+            return self.isHvmEnabled() and "AuthenticAMD" in self.getHostParam("cpu_info")
         else:
             cpuinfo = self.execdom0("cat /proc/cpuinfo")
-            return self.isHvmEnabled() and re.search(r"svm", cpuinfo)
+            return self.isHvmEnabled() and re.search(r"AuthenticAMD", cpuinfo)
 
     def isVmxHardware(self):
         """Return True if host is HVM compatible and has VMX enabled"""
         if isinstance(self, xenrt.lib.xenserver.BostonHost):
-            return self.isHvmEnabled() and "vmx" in self.getHostParam("cpu_info")
+            return self.isHvmEnabled() and "GenuineIntel" in self.getHostParam("cpu_info")
         else:
             cpuinfo = self.execdom0("cat /proc/cpuinfo")
-            return self.isHvmEnabled() and re.search(r"vmx", cpuinfo)
+            return self.isHvmEnabled() and re.search(r"GenuineIntel", cpuinfo)
 
     def getBridgeWithMapping(self, index):
         """Returns the name of a bridge corresponding to the interface