CA-188578 - Not running on VMX hardware

diff --git a/exec/xenrt/lib/xenserver/host.py b/exec/xenrt/lib/xenserver/host.py
index d8abb14bdcd93b3578edc0c5525b77160e3b15e2..8d8124f03297c86754da55b7d5a2a1353ec1148a 100755 (executable)
--- 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