iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: MTRR: simplify kvm_mtrr_get_guest_memory_type

Browse Source 
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>
This commit is contained in:
Xiao Guangrong 2015-07-16 03:25:55 +08:00 committed by Paolo Bonzini
parent 10dc331ff5
commit 3e5d2fdced
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/x86/kvm/mtrr.c
View File

@ -672,15 +672,16 @@ u8 kvm_mtrr_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn)
if (iter.mtrr_disabled) if (iter.mtrr_disabled)
return mtrr_disabled_type(); 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.
* We just check one page, partially covered by MTRRs is */
* impossible. WARN_ON(iter.partial_map);
*/
WARN_ON(type != -1); /* not contained in any MTRRs. */
type = mtrr_default_type(mtrr_state); if (type == -1)
} return mtrr_default_type(mtrr_state);
return type; return type;
} }
EXPORT_SYMBOL_GPL(kvm_mtrr_get_guest_memory_type); EXPORT_SYMBOL_GPL(kvm_mtrr_get_guest_memory_type);