Update to detect QEMU via 'TCGTCGTCGTCG' CPUID

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

diff --git a/virt-what.in b/virt-what.in
index 761fc1b..5f9edd7 100644 (file)
--- a/virt-what.in
+++ b/virt-what.in
@@ -74,6 +74,7 @@ test $# -gt 0 && fail "extra operand '$1'"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 PATH="${root}@libexecdir@:${root}/sbin:${root}/usr/sbin:${PATH}"
+export PATH
 
 # Check we're running as root.
 EFFUID=$(id -u) || fail "failed to get current user id"
@@ -134,6 +135,13 @@ if echo "$dmi" | grep -q 'Manufacturer: innotek GmbH'; then
     echo virtualbox
 fi
 
+# Check for bhyve.
+if [ "$cpuid" = "bhyve bhyve " ]; then
+  echo bhyve
+elif echo "$dmi" | grep -q "Vendor: BHYVE"; then
+  echo bhyve
+fi
+
 # Check for OpenVZ / Virtuozzo.
 # Added by Evgeniy Sokolov.
 # /proc/vz - always exists if OpenVZ kernel is running (inside and outside
@@ -186,7 +194,9 @@ fi
 if have_cpuinfo && 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
+        if grep -q 'VM.*Control Program.*KVM/Linux' "${root}/proc/sysinfo"; then
+            echo ibm_systemz-kvm
+        elif 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
@@ -265,6 +275,9 @@ fi
 if ! "$skip_qemu_kvm"; then
     if [ "$cpuid" = "KVMKVMKVM" ]; then
         echo kvm
+    elif [ "$cpuid" = "TCGTCGTCGTCG" ]; then
+        echo qemu
+        skip_lkvm=true
     elif echo "$dmi" | grep -q 'Product Name: KVM'; then
         echo kvm
         skip_lkvm=true
@@ -281,11 +294,16 @@ if ! "$skip_qemu_kvm"; then
             echo qemu
             skip_lkvm=true
         fi
+    elif [ -d /proc/device-tree/hypervisor ] &&
+         grep -q "linux,kvm" /proc/device-tree/hypervisor/compatible; then
+        # We are running as a spapr KVM guest on ppc64
+        echo kvm
+        skip_lkvm=true
     else
-        # XXX This is known to fail for qemu with the explicit -cpu
+        # This is known to fail for qemu with the explicit -cpu
         # option, since /proc/cpuinfo will not contain the QEMU
-        # string.  The long term fix for this would be to export
-        # another CPUID leaf for non-accelerated qemu.
+        # string. QEMU 2.10 added a new CPUID leaf, so this
+        # problem only triggered for older QEMU
         if grep -q 'QEMU' "${root}/proc/cpuinfo"; then
             echo qemu
         fi