diff options
Diffstat (limited to 'app-emulation/virt-what/files/virt-what-1.2-vmware-cpuid-check.patch')
| -rw-r--r-- | app-emulation/virt-what/files/virt-what-1.2-vmware-cpuid-check.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/app-emulation/virt-what/files/virt-what-1.2-vmware-cpuid-check.patch b/app-emulation/virt-what/files/virt-what-1.2-vmware-cpuid-check.patch new file mode 100644 index 000000000000..2326e6298d9e --- /dev/null +++ b/app-emulation/virt-what/files/virt-what-1.2-vmware-cpuid-check.patch @@ -0,0 +1,48 @@ +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 |