diff options
| author | Xiao Guangrong <guangrong.xiao@intel.com> | 2015-07-15 21:25:55 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-07-23 08:21:48 +0200 |
| commit | 3e5d2fdceda172554e681b68c853bf5d08205bbf (patch) | |
| tree | f6535b9fa1d44563ea348968b11056492e41c107 /arch/x86/kvm/mtrr.c | |
| parent | KVM: MTRR: fix memory type handling if MTRR is completely disabled (diff) | |
| download | linux-3e5d2fdceda172554e681b68c853bf5d08205bbf.tar.xz linux-3e5d2fdceda172554e681b68c853bf5d08205bbf.zip | |
KVM: MTRR: simplify kvm_mtrr_get_guest_memory_type
kvm_mtrr_get_guest_memory_type never returns -1 which is implied
in the current code since if @type = -1 (means no MTRR contains the
range), iter.partial_map must be true
Simplify the code to indicate this fact
Signed-off-by: Xiao Guangrong <guangrong.xiao@intel.com>
Tested-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/mtrr.c')
| -rw-r--r-- | arch/x86/kvm/mtrr.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/x86/kvm/mtrr.c b/arch/x86/kvm/mtrr.c index e2750134a22b..dc0a84a6f309 100644 --- a/arch/x86/kvm/mtrr.c +++ b/arch/x86/kvm/mtrr.c @@ -672,15 +672,16 @@ u8 kvm_mtrr_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn) if (iter.mtrr_disabled) return mtrr_disabled_type(); - /* It is not covered by MTRRs. */ - if (iter.partial_map) { - /* - * We just check one page, partially covered by MTRRs is - * impossible. - */ - WARN_ON(type != -1); - type = mtrr_default_type(mtrr_state); - } + /* + * We just check one page, partially covered by MTRRs is + * impossible. + */ + WARN_ON(iter.partial_map); + + /* not contained in any MTRRs. */ + if (type == -1) + return mtrr_default_type(mtrr_state); + return type; } EXPORT_SYMBOL_GPL(kvm_mtrr_get_guest_memory_type); |