X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-what.in;h=776bfdee5103dec8018b79c7b895224d180a3149;hb=8528efafcad59f0fde7e15860f19061c3af810fa;hp=d37da85302e05283f96af5bdc1781067406f7596;hpb=74d099109217f7a4c0ec9790c6e83df392f4a5ae;p=virt-what.git

diff --git a/virt-what.in b/virt-what.in
index d37da85..776bfde 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -54,16 +54,16 @@ usage () {
 # Handle the command line arguments, if any.
 while test $# -gt 0; do
     case "$1" in
-	--help) usage ;;
+        --help) usage ;;
         --test-root=*)
             # Deliberately undocumented: used for 'make check'.
             root=$(echo "$1" | sed 's/.*=//')
             shift 1
             test -z "$root" && fail "--test-root option requires a value"
             ;;
-	-v|--version) echo "$VERSION"; exit 0 ;;
-	--) shift; break ;;
-	*) fail "unrecognized option '$1'";;
+        -v|--version) echo "$VERSION"; exit 0 ;;
+        --) shift; break ;;
+        *) fail "unrecognized option '$1'";;
     esac
 done
 test $# -gt 0 && fail "extra operand '$1'"
@@ -261,7 +261,15 @@ fi
 
 if ! "$skip_qemu_kvm"; then
     if [ "$cpuid" = "KVMKVMKVM" ]; then
-	echo kvm
+        echo kvm
+    elif echo "$dmi" | grep -q 'Product Name: KVM'; then
+        echo kvm
+        skip_lkvm=true
+    elif echo "$dmi" | grep -q 'Manufacturer: QEMU'; then
+        # The test for KVM above failed, so now we know we're
+        # not using KVM acceleration.
+        echo qemu
+        skip_lkvm=true
     elif [ "$arch" = "arm" ] || [ "$arch" = "aarch64" ]; then
         if [ -d "${root}/proc/device-tree" ] &&
             ls "${root}/proc/device-tree" | grep -q "fw-cfg"; then
@@ -269,11 +277,6 @@ if ! "$skip_qemu_kvm"; then
             # using KVM acceleration or not.
             echo qemu
             skip_lkvm=true
-        elif echo "$dmi" | grep -q 'Manufacturer: QEMU'; then
-            # We don't have enough information to determine if we're
-            # using KVM acceleration or not.
-            echo qemu
-            skip_lkvm=true
         fi
     else
         # XXX This is known to fail for qemu with the explicit -cpu
@@ -281,8 +284,8 @@ if ! "$skip_qemu_kvm"; then
         # string.  The long term fix for this would be to export
         # another CPUID leaf for non-accelerated qemu.
         if grep -q 'QEMU' "${root}/proc/cpuinfo"; then
-	    echo qemu
-	fi
+            echo qemu
+        fi
     fi
 fi
 
@@ -293,11 +296,11 @@ if ! "$skip_lkvm"; then
         if [ -d "${root}/proc/device-tree" ] &&
             grep -q "dummy-virt" "${root}/proc/device-tree/compatible"; then
             echo lkvm
-	fi
+        fi
     fi
 fi
 
 # Check for Docker.
 if [ -f "${root}/.dockerinit" ]; then
-	echo docker
+    echo docker
 fi