aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-05-10 04:41:39 -0400
committerAvi Kivity <avi@redhat.com>2009-06-10 04:48:52 -0400
commit8d753f369bd28fff1706ffe9fb9fea4fd88cf85b (patch)
treea33e0ca6ba73670c14b999b877f15bfcf8fdb767 /arch/x86/kvm
parentd6a8c875f35a6e1b3fb3f21e93eabb183b1f39ee (diff)
KVM: Fix cpuid feature misreporting
MTRR, PAT, MCE, and MCA are all supported (to some extent) but not reported. Vista requires these features, so if userspace relies on kernel cpuid reporting, it loses support for Vista. Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r--arch/x86/kvm/x86.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index a0faa4882f84..da3e65bfc6ee 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1254,9 +1254,12 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
1254 bit(X86_FEATURE_VME) | bit(X86_FEATURE_DE) | 1254 bit(X86_FEATURE_VME) | bit(X86_FEATURE_DE) |
1255 bit(X86_FEATURE_PSE) | bit(X86_FEATURE_TSC) | 1255 bit(X86_FEATURE_PSE) | bit(X86_FEATURE_TSC) |
1256 bit(X86_FEATURE_MSR) | bit(X86_FEATURE_PAE) | 1256 bit(X86_FEATURE_MSR) | bit(X86_FEATURE_PAE) |
1257 bit(X86_FEATURE_MCE) |
1257 bit(X86_FEATURE_CX8) | bit(X86_FEATURE_APIC) | 1258 bit(X86_FEATURE_CX8) | bit(X86_FEATURE_APIC) |
1258 bit(X86_FEATURE_SEP) | bit(X86_FEATURE_PGE) | 1259 bit(X86_FEATURE_SEP) | bit(X86_FEATURE_MTRR) |
1259 bit(X86_FEATURE_CMOV) | bit(X86_FEATURE_PSE36) | 1260 bit(X86_FEATURE_PGE) | bit(X86_FEATURE_MCA) |
1261 bit(X86_FEATURE_CMOV) | bit(X86_FEATURE_PAT) |
1262 bit(X86_FEATURE_PSE36) |
1260 bit(X86_FEATURE_CLFLSH) | bit(X86_FEATURE_MMX) | 1263 bit(X86_FEATURE_CLFLSH) | bit(X86_FEATURE_MMX) |
1261 bit(X86_FEATURE_FXSR) | bit(X86_FEATURE_XMM) | 1264 bit(X86_FEATURE_FXSR) | bit(X86_FEATURE_XMM) |
1262 bit(X86_FEATURE_XMM2) | bit(X86_FEATURE_SELFSNOOP); 1265 bit(X86_FEATURE_XMM2) | bit(X86_FEATURE_SELFSNOOP);