aboutsummaryrefslogtreecommitdiffstats
path: root/target-i386/cpuid.c
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@amd.com>2010-06-02 11:57:47 +0200
committerMarcelo Tosatti <mtosatti@redhat.com>2010-06-28 13:06:03 -0300
commit8935499831312ec3e108287d3d49614915847ab2 (patch)
treeb3a9504be32e2b18518cd4d8e20b0d0e530de5fa /target-i386/cpuid.c
parentbe41cbe0368b5becac02a1bf885341ba25ba9a9e (diff)
fix CPUID vendor override
the meaning of vendor_override is actually the opposite of how it is currently used :-( Fix it to allow KVM to export the non-native CPUID vendor if explicitly requested by the user. The intended behavior is: With TCG: - always inject the configured vendor (either hard-coded, in config files or via ",vendor=" commandline) With KVM: - by default inject the host's vendor - if the user specifies ",vendor=" on the commandline, use this instead of the host's vendor - all pre-configured vendors (hard-coded, config file) are ignored Signed-off-by: Andre Przywara <andre.przywara@amd.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-i386/cpuid.c')
-rw-r--r--target-i386/cpuid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c
index 6a0f7ca82..fe0e6b21a 100644
--- a/target-i386/cpuid.c
+++ b/target-i386/cpuid.c
@@ -982,7 +982,7 @@ static void get_cpuid_vendor(CPUX86State *env, uint32_t *ebx,
* this if you want to use KVM's sysenter/syscall emulation
* in compatibility mode and when doing cross vendor migration
*/
- if (kvm_enabled() && env->cpuid_vendor_override) {
+ if (kvm_enabled() && ! env->cpuid_vendor_override) {
host_cpuid(0, 0, NULL, ebx, ecx, edx);
}
}