From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 18 Jul 2017 12:45:09 +0000 (+0100)
Subject: Update to detect QEMU via 'TCGTCGTCGTCG' CPUID
X-Git-Tag: v1.16~5
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=a476928ba4a545e51ee2511d8352e513e3834538;p=virt-what.git

Update to detect QEMU via 'TCGTCGTCGTCG' CPUID

QEMU >= 2.10 will start reporting the string "TCGTCGTCGTCG"
for CPUID queries when running under TCG only (KVM signature
is unchanged)

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/virt-what.in b/virt-what.in
index 5cf2136..5f9edd7 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -275,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
@@ -297,10 +300,10 @@ if ! "$skip_qemu_kvm"; then
         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