diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-28 10:48:00 +0200 |
|---|---|---|
| committer |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-12-28 19:59:00 -0200 |
| commit | 4dad7ff32aa6dcf18cef0c606d8fb43ff0b939a1 (patch) | |
| tree | a039610052d47c2def666eb0932358dab28bf5f7 /target-i386 | |
| parent | fix multiple definition of mulu64 and muls64 with user targets (diff) | |
| download | qemu-kvm-4dad7ff32aa6dcf18cef0c606d8fb43ff0b939a1.tar.gz qemu-kvm-4dad7ff32aa6dcf18cef0c606d8fb43ff0b939a1.tar.bz2 qemu-kvm-4dad7ff32aa6dcf18cef0c606d8fb43ff0b939a1.zip | |
Reinstate cpuid vendor override when kvm is enabled
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 <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | 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 9a50da64d..b58fd8253 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); |