X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-what.in;h=870c09b0bf79938c3124585118f337d37b309b5e;hb=0e90af4014da8065a4062319921288baf972c6fb;hp=e311067c149e74324b8936e208f68d84e7fb2dbd;hpb=f74a5f24635f8dbb202ad1c7ea141606ca864f1f;p=virt-what.git

diff --git a/virt-what.in b/virt-what.in
index e311067..870c09b 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -100,8 +100,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
 
@@ -121,6 +123,11 @@ 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' $root/proc/cpuinfo; then
@@ -138,6 +145,26 @@ if echo "$dmi" | grep -q 'Manufacturer.*HITACHI' &&
     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
@@ -151,11 +178,12 @@ elif [ -f $root/proc/xen/capabilities ]; then
         echo xen-domU
     fi
     is_xen=1
-elif [ -d $root/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.