diff options
| author | Richard Jones <rjones@redhat.com> | 2010-07-01 19:26:26 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-07-01 20:34:36 +0100 |
| commit | 7ee7259d347089b50324d6b5e4e27d2ebee04a00 (patch) | |
| tree | 7e3c496e362b027620fb12837f51365318644b95 /virt-what.in | |
| parent | 25ec46454ca3aec7886d45ee4d99d7db330c34f7 (diff) | |
| download | virt-what-7ee7259d347089b50324d6b5e4e27d2ebee04a00.tar.gz virt-what-7ee7259d347089b50324d6b5e4e27d2ebee04a00.tar.xz virt-what-7ee7259d347089b50324d6b5e4e27d2ebee04a00.zip | |
Check for VMWare using the CPUID (thanks: Chetan Loke).
Diffstat (limited to 'virt-what.in')
| -rw-r--r-- | virt-what.in | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/virt-what.in b/virt-what.in index 11ca772..313cd06 100644 --- a/virt-what.in +++ b/virt-what.in @@ -70,14 +70,26 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ PATH=@libexecdir@:/sbin:/usr/sbin:$PATH +# Many fullvirt hypervisors give an indication through CPUID. Use the +# helper program to get this information. + +cpuid=`virt-what-cpuid-helper` + # Check for various products in the BIOS information. dmi=`dmidecode 2>&1` -if echo "$dmi" | grep -q 'Manufacturer: VMware'; then +# Check for VMware. +# cpuid check added by Chetan Loke. + +if [ "$cpuid" = "VMwareVMware" ]; then + echo vmware +elif echo "$dmi" | grep -q 'Manufacturer: VMware'; then echo vmware fi +# Check for VirtualPC. + if echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation'; then echo virtualpc fi @@ -101,14 +113,9 @@ fi # Check for UML. # Added by Laurent Léonard. if grep -q 'UML' /proc/cpuinfo; then - echo uml + echo uml fi -# To tell if it is Xen and KVM HVM (fully virtualized) we can use this -# helper C program. - -cpuid=`virt-what-cpuid-helper` - # Check for Xen. if [ "$cpuid" = "XenVMMXenVMM" ]; then |