aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSheng Yang <sheng@linux.intel.com>2010-01-05 19:02:28 +0800
committerMarcelo Tosatti <mtosatti@redhat.com>2010-01-25 12:26:37 -0200
commit82b7005f0e72d8d1a8226e4c192cbb0850d10b3f (patch)
tree19f72919eda5126ca257d6d2f0936e95fdd554fe
parente1f829b6f453c7985cfdfab616994b4051c3d788 (diff)
downloadmrst-s0i3-test-82b7005f0e72d8d1a8226e4c192cbb0850d10b3f.tar.gz
mrst-s0i3-test-82b7005f0e72d8d1a8226e4c192cbb0850d10b3f.tar.xz
mrst-s0i3-test-82b7005f0e72d8d1a8226e4c192cbb0850d10b3f.zip
KVM: x86: Fix host_mapping_level()
When found a error hva, should not return PAGE_SIZE but the level... Also clean up the coding style of the following loop. Cc: stable@kernel.org Signed-off-by: Sheng Yang <sheng@linux.intel.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--arch/x86/kvm/mmu.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 4c3e5b2314c..89a49fb46a2 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -477,7 +477,7 @@ static int host_mapping_level(struct kvm *kvm, gfn_t gfn)
addr = gfn_to_hva(kvm, gfn);
if (kvm_is_error_hva(addr))
- return page_size;
+ return PT_PAGE_TABLE_LEVEL;
down_read(&current->mm->mmap_sem);
vma = find_vma(current->mm, addr);
@@ -515,11 +515,9 @@ static int mapping_level(struct kvm_vcpu *vcpu, gfn_t large_gfn)
if (host_level == PT_PAGE_TABLE_LEVEL)
return host_level;
- for (level = PT_DIRECTORY_LEVEL; level <= host_level; ++level) {
-
+ for (level = PT_DIRECTORY_LEVEL; level <= host_level; ++level)
if (has_wrprotected_page(vcpu->kvm, large_gfn, level))
break;
- }
return level - 1;
}