From: Eduardo Habkost <ehabkost@redhat.com>
Date: Mon, 26 Sep 2016 22:11:14 +0000 (-0300)
Subject: target-i386: Clear KVM CPUID features if KVM is disabled
X-Git-Tag: qemu-xen-4.9.0-rc1~173^2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=aec661de86894e914d2d82431d9cefa9a9a40213;p=qemu-xen.git

target-i386: Clear KVM CPUID features if KVM is disabled

This will ensure all checks for features[FEAT_KVM] in the code
will be correct in case the KVM CPUID leaf is completely
disabled.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index ad09246d59..333309b9a7 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -3038,6 +3038,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
         cpu->env.features[w] &= ~minus_features[w];
     }
 
+    if (!kvm_enabled() || !cpu->expose_kvm) {
+        env->features[FEAT_KVM] = 0;
+    }
+
     x86_cpu_enable_xsave_components(cpu);
 
     /* CPUID[EAX=7,ECX=0].EBX always increased level automatically: */