Use crossystem inside_vm

telemetry/telemetry/core/cros_interface.py

Index: telemetry/telemetry/core/cros_interface.py
diff --git a/telemetry/telemetry/core/cros_interface.py b/telemetry/telemetry/core/cros_interface.py
index d63a9e885731bed1bf6c8567f84c11c09f686e35..9f7d4bf383ceda6d41f2478396f362892b991d5e 100644
--- a/telemetry/telemetry/core/cros_interface.py
+++ b/telemetry/telemetry/core/cros_interface.py
@@ -502,11 +502,8 @@ class CrOSInterface(object):
   def GetArchName(self):
     return self.RunCmdOnDevice(['uname', '-m'])[0]
 
-  def SysVendor(self):
-    return self.GetFileContents('/sys/class/dmi/id/sys_vendor').rstrip()
-
   def IsRunningOnVM(self):
-    return self.SysVendor() == 'QEMU'
+    return self.RunCmdOnDevice(['crossystem', 'inside_vm'])[0] != '0'

[norvez, 2016/08/18 11:28:27]

Can you rather check that stdout == '1'? Otherwise errors (e.g. older crossystem
binary or broken system) will be false positives.

[achuithb, 2016/08/18 18:36:02]

This is intentional - we prefer false positives, and a false positive would
retain old behavior.

[norvez, 2016/08/18 22:58:00]

ok

 
   def LsbReleaseValue(self, key, default):
     """/etc/lsb-release is a file with key=value pairs."""