From 9b343b02ede3447914cb90e4ec4e5e763412249b Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Tue, 31 Mar 2015 10:27:55 +0200 Subject: [PATCH] bug #3722: use both lsmod and sys directory methods to check for kvm --- src/vnm_mad/remotes/lib/vnm_driver.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vnm_mad/remotes/lib/vnm_driver.rb b/src/vnm_mad/remotes/lib/vnm_driver.rb index 1445e66ae0..cc5e4bd597 100644 --- a/src/vnm_mad/remotes/lib/vnm_driver.rb +++ b/src/vnm_mad/remotes/lib/vnm_driver.rb @@ -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