bug #3722: do not use modules to check for kvm

(cherry picked from commit 08b3b8c01a)
This commit is contained in:
Javi Fontan committed 2015-03-31 10:29:17 +02:00
1 parent d33ce04a33
commit 00764fccf4
1 file changed
+2 -2
+2 -2
View File
@@ -81,12 +81,12 @@ module VNMMAD
# Return a string for the hypervisor
# @return [String] "kvm", "xen" or nil
def detect_hypervisor
lsmod = `#{VNMNetwork::COMMANDS[:lsmod]}`
xen_file = "/proc/xen/capabilities"
kvm_dir = "/sys/class/misc/kvm"
if File.exists?(xen_file)
"xen"
elsif lsmod.match(/kvm/)
elsif File.exists?(kvm_dir)
"kvm"
else
nil