[Qemu-devel] [PATCH] Reinstate cpuid vendor override when kvm is enabled

[Avi Kivity]

Due to upstream qemu changes we no longer expose the host cpu vendor id
to the guest.  This leads to failures when the syscall/sysenter instructions
are used in compatibility mode.

Change the default to override when kvm is enabled.

Signed-off-by: Avi Kivity <address@hidden>
---
 target-i386/helper.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/target-i386/helper.c b/target-i386/helper.c
index 9a50da6..b58fd82 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -518,7 +518,7 @@ static int cpu_x86_register (CPUX86State *env, const char 
*cpu_model)
         env->cpuid_vendor2 = CPUID_VENDOR_INTEL_2;
         env->cpuid_vendor3 = CPUID_VENDOR_INTEL_3;
     }
-    env->cpuid_vendor_override = def->vendor_override;
+    env->cpuid_vendor_override = def->vendor_override || kvm_enabled();
     env->cpuid_level = def->level;
     if (def->family > 0x0f)
         env->cpuid_version = 0xf00 | ((def->family - 0x0f) << 20);
-- 
1.6.5.3