KVM: MTRR: do not split 64 bits MSR content

Variable MTRR MSRs are 64 bits which are directly accessed with full length,
no reason to split them to two 32 bits

Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 8d43006a6df047a0de230ad75da452293fbae2ea..f735548748450ea8843af48b9cb8f4e6f265ff4c 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -342,8 +342,13 @@ enum {
        KVM_DEBUGREG_RELOAD = 4,
 };
 
+struct kvm_mtrr_range {
+       u64 base;
+       u64 mask;
+};
+
 struct kvm_mtrr {
-       struct mtrr_var_range var_ranges[KVM_NR_VAR_MTRR];
+       struct kvm_mtrr_range var_ranges[KVM_NR_VAR_MTRR];
        mtrr_type fixed_ranges[KVM_NR_FIXED_MTRR_REGION];
        u64 deftype;
 };

diff --cc arch/x86/kvm/mtrr.c
Simple merge