summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-08-18 16:39:48 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2014-08-19 15:12:28 +0200
commit0d234daf7e0a3290a3a20c8087eefbd6335a5bd4 (patch)
treeac5623ee51094af0c3a0c07ca8366716351b3c7f
parent9a4cfb27f7233610c5ddc82329c26d39683fad72 (diff)
downloadlinux-0d234daf7e0a3290a3a20c8087eefbd6335a5bd4.tar.gz
linux-0d234daf7e0a3290a3a20c8087eefbd6335a5bd4.tar.bz2
linux-0d234daf7e0a3290a3a20c8087eefbd6335a5bd4.zip
Revert "KVM: x86: Increase the number of fixed MTRR regs to 10"
This reverts commit 682367c494869008eb89ef733f196e99415ae862, which causes 32-bit SMP Windows 7 guests to panic. SeaBIOS has a limit on the number of MTRRs that it can handle, and this patch exceeded the limit. Better revert it. Thanks to Nadav Amit for debugging the cause. Cc: stable@nongnu.org Reported-by: Wanpeng Li <wanpeng.li@linux.intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--arch/x86/include/asm/kvm_host.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 572460175ba5..7c492ed9087b 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -95,7 +95,7 @@ static inline gfn_t gfn_to_index(gfn_t gfn, gfn_t base_gfn, int level)
#define KVM_REFILL_PAGES 25
#define KVM_MAX_CPUID_ENTRIES 80
#define KVM_NR_FIXED_MTRR_REGION 88
-#define KVM_NR_VAR_MTRR 10
+#define KVM_NR_VAR_MTRR 8
#define ASYNC_PF_PER_VCPU 64