X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-what.in;h=e0fdf5bf2e17fbf1244d9189ef6f30a6d051e81d;hb=74a75da0d0b330859efba84a3ec37a7a7076fb0e;hp=ddd6faf57ee94b16218ac5e8c9efaff172aaa513;hpb=1c5557995137f53579582e91986f57ce6b4befff;p=virt-what.git

diff --git a/virt-what.in b/virt-what.in
index ddd6faf..e0fdf5b 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -43,19 +43,31 @@ function usage {
 
 # Handle the command line arguments, if any.
 
-TEMP=`getopt -o v --long help --long version -n 'virt-what' -- "$@"`
+TEMP=`getopt -o v --long help --long version --long test-root: -n 'virt-what' -- "$@"`
 if [ $? != 0 ]; then exit 1; fi
 eval set -- "$TEMP"
 
 while true; do
     case "$1" in
 	--help) usage ;;
+        --test-root)
+            # Deliberately undocumented: used for 'make check'.
+            root="$2"
+            shift 2
+            ;;
 	-v|--version) echo $VERSION; exit 0 ;;
 	--) shift; break ;;
-	*) fail "internal error" ;;
+	*) fail "internal error ($1)" ;;
     esac
 done
 
+# 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=$root@libexecdir@:$root/sbin:$root/usr/sbin:$PATH
+
 # Check we're running as root.
 
 uid=`id -u`
@@ -63,21 +75,17 @@ if [ "$uid" != 0 ]; then
     fail "this script must be run as root"
 fi
 
-# 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.
+# Note that dmidecode doesn't exist on non-PC architectures.  On these,
+# this will return an error which is ignored (error message redirected
+# into $dmi variable).
 
-dmi=`dmidecode 2>&1`
+dmi=`LANG=C dmidecode 2>&1`
 
 # Check for VMware.
 # cpuid check added by Chetan Loke.
@@ -95,8 +103,10 @@ if [ "$cpuid" = "Microsoft Hv" ]; then
 fi
 
 # Check for VirtualPC.
-
-if echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation'; then
+# The negative check for cpuid is to distinguish this from Hyper-V
+# which also has the same manufacturer string in the SM-BIOS data.
+if [ "$cpuid" != "Microsoft Hv" ] &&
+    echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation'; then
     echo virtualpc
 fi
 
@@ -112,39 +122,71 @@ fi
 # container)
 # /proc/bc - exists on node, but not inside container.
 
-if [ -d /proc/vz -a ! -d /proc/bc ]; then
+if [ -d $root/proc/vz -a ! -d $root/proc/bc ]; then
     echo openvz
 fi
 
+# Check for Linux-VServer
+if cat $root/proc/self/status | grep -q "VxID: [0-9]*"; then
+    echo linux_vserver
+fi
+
 # Check for UML.
 # Added by Laurent Léonard.
-if grep -q 'UML' /proc/cpuinfo; then
+if grep -q 'UML' $root/proc/cpuinfo; then
     echo uml
 fi
 
 # Check for IBM PowerVM Lx86 Linux/x86 emulator.
-if grep -q '^vendor_id.*PowerVM Lx86' /proc/cpuinfo; then
+if grep -q '^vendor_id.*PowerVM Lx86' $root/proc/cpuinfo; then
     echo powervm_lx86
 fi
 
+# Check for Hitachi Virtualization Manager (HVM) Virtage logical partitioning.
+if echo "$dmi" | grep -q 'Manufacturer.*HITACHI' &&
+   echo "$dmi" | grep -q 'Product.*HVM LPAR'; then
+    echo virtage
+fi
+
+# Check for IBM SystemZ.
+if grep -q '^vendor_id.*IBM/S390' $root/proc/cpuinfo; then
+    echo ibm_systemz
+    if [ -f $root/proc/sysinfo ]; then
+        if grep -q 'VM.*Control Program.*z/VM' $root/proc/sysinfo; then
+            echo ibm_systemz-zvm
+        elif grep -q '^LPAR' $root/proc/sysinfo; then
+            echo ibm_systemz-lpar
+        else
+            # This is unlikely to be correct.
+            echo ibm_systemz-direct
+        fi
+    fi
+fi
+
+# Check for Parallels.
+if echo "$dmi" | grep -q 'Vendor: Parallels'; then
+    echo parallels
+fi
+
 # Check for Xen.
 
 if [ "$cpuid" = "XenVMMXenVMM" ]; then
     echo xen; echo xen-hvm
     is_xen=1
-elif [ -f /proc/xen/capabilities ]; then
+elif [ -f $root/proc/xen/capabilities ]; then
     echo xen
-    if grep -q "control_d" /proc/xen/capabilities; then
+    if grep -q "control_d" $root/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
-    # installed, even on baremetal.  Don't confuse people by
-    # printing anything.
-    :
+elif [ -f $root/sys/hypervisor/type ] &&
+    grep -q "xen" $root/sys/hypervisor/type; then
+    # Ordinary kernel with pv_ops.  There does not seem to be
+    # enough information at present to tell whether this is dom0
+    # or domU.  XXX
+    echo xen
 fi
 
 # Check for QEMU/KVM.
@@ -153,7 +195,7 @@ if [ ! "$is_xen" ]; then
     # Disable this test if we know this is Xen already, because Xen
     # uses QEMU for its device model.
 
-    if grep -q 'QEMU' /proc/cpuinfo; then
+    if grep -q 'QEMU' $root/proc/cpuinfo; then
 	if [ "$cpuid" = "KVMKVMKVM" ]; then
 	    echo kvm
 	else