X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-what.in;h=46bf12df7865162f945d243ad70e2ea6d9158333;hb=ee4ad55ae2b9294d03e45a364c70c42f945d2fc7;hp=ebea7a17788fb9719a016948d4f3fcc6497017b3;hpb=9cc6eaf572ed11e355633491bdbd1a113ff80a54;p=virt-what.git

diff --git a/virt-what.in b/virt-what.in
index ebea7a1..46bf12d 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # @configure_input@
-# Copyright (C) 2008-2009 Red Hat Inc.
+# Copyright (C) 2008-2010 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -63,22 +63,45 @@ if [ "$uid" != 0 ]; then
     fail "this script must be run as root"
 fi
 
-PATH=/sbin:/usr/sbin:$PATH
+# Add /sbin and /usr/sbin to the path so we can find system
+# binaries like dmicode.
+# Add /usr/libexec to the path so we can find the helper binary.
+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 Hyper-V.
+# http://blogs.msdn.com/b/sqlosteam/archive/2010/10/30/is-this-real-the-metaphysics-of-hardware-virtualization.aspx
+if [ "$cpuid" = "Microsoft Hv" ]; then
+    echo hyperv
 fi
 
+# Check for VirtualPC.
+
 if echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation'; then
     echo virtualpc
 fi
 
 # Check for VirtualBox.
-
+# Added by Laurent Léonard.
 if echo "$dmi" | grep -q 'Manufacturer: innotek GmbH'; then
     echo virtualbox
 fi
@@ -94,26 +117,23 @@ if [ -d /proc/vz -a ! -d /proc/bc ]; then
 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
     echo xen; echo xen-hvm
     is_xen=1
-elif [ -f /proc/xen/privcmd ]; then
-    echo xen; echo xen-dom0
-    is_xen=1
 elif [ -f /proc/xen/capabilities ]; then
-    echo xen; echo xen-domU
+    echo xen
+    if grep -q "control_d" /proc/xen/capabilities; then
+        echo xen-dom0
+    else
+        echo xen-domU
+    fi
     is_xen=1
 elif [ -d /proc/xen ]; then
     # This directory can be present when Xen paravirt drivers are