1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-11 05:17:41 +03:00

bug #3722: use both lsmod and sys directory methods to check for kvm

(cherry picked from commit 9b343b02ed)
This commit is contained in:
Javi Fontan 2015-03-31 10:27:55 +02:00
parent 00764fccf4
commit 36aafcc288

View File

@ -81,12 +81,13 @@ 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 File.exists?(kvm_dir)
elsif lsmod.match(/kvm/) || File.exists?(kvm_dir)
"kvm"
else
nil