Add detection of IBM PowerVM Lx86 Linux/x86 emulator.

[virt-what.git] / virt-what.in

diff --git a/virt-what.in b/virt-what.in
index 11ca772..ddd6faf 100644 (file)
--- 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-2011 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
@@ -70,14 +70,32 @@ 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
@@ -101,24 +119,26 @@ 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 IBM PowerVM Lx86 Linux/x86 emulator.
+if grep -q '^vendor_id.*PowerVM Lx86' /proc/cpuinfo; then
+    echo powervm_lx86
+fi
 
 # 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