diff options
author | Tim Smith <tsmith84@gmail.com> | 2016-03-04 15:55:25 -0800 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2016-03-07 10:07:30 -0800 |
commit | 49a4bee91d94f764c30cc87c111497b411194e0a (patch) | |
tree | 3143b98444d051698df5c502e249b2d5edf372e7 | |
parent | 75ab6df9a1d3415fa8dfbaaa45589be535bc02d7 (diff) | |
download | ohai-49a4bee91d94f764c30cc87c111497b411194e0a.tar.gz |
Detect additional paravirt KVM cpu strings
Copy and past from Linux Virtualization plugin
-rw-r--r-- | lib/ohai/plugins/solaris2/virtualization.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ohai/plugins/solaris2/virtualization.rb b/lib/ohai/plugins/solaris2/virtualization.rb index 13ee7839..80cbfafc 100644 --- a/lib/ohai/plugins/solaris2/virtualization.rb +++ b/lib/ohai/plugins/solaris2/virtualization.rb @@ -30,11 +30,11 @@ Ohai.plugin(:Virtualization) do collect_data(:solaris2) do virtualization Mash.new - # Detect KVM/QEMU from cpuinfo, report as KVM + # Detect paravirt KVM/QEMU from cpuinfo, report as KVM psrinfo_path = Ohai.abs_path( "/usr/sbin/psrinfo" ) - if File.exists?(psrinfo_path) + if File.exist?(psrinfo_path) so = shell_out("#{psrinfo_path} -pv") - if so.stdout =~ /QEMU Virtual CPU/ + if so.stdout =~ /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/ virtualization[:system] = "kvm" virtualization[:role] = "guest" end |