-
Committer:
Tarmac
-
Author(s):
Alberto Donato
-
Date:
2013-06-28 09:09:27 UTC
-
mfrom:
(693.1.7 detect-openstack-vm)
-
Revision ID:
tarmac-20130628090927-by3vsilqjlz1heqh
Merge detect-openstack-vm [f=1191843] [r=tealeg,bjornt] [a=Alberto Donato]
This changes the detection logic for kvm virtual machines, looking for the "Bochs" as reported by OpenStack Folsom) or "OpenStack" (as reported by Grizzly) vendor in /sys rather than the CPU model.
It also refactors a bit the existing logic, and only tries to detect HyperV/VmWare/KVM if the "hypervisor" flag is present in /proc/cpuinfo, which is meant to report that the machine is running under an hypervisor.