diff options
author | Dong, Eddie <eddie.dong@intel.com> | 2008-01-02 01:29:08 -0500 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 11:01:21 -0500 |
commit | 5882842f9b86179e1fe2e17e35e0e46a268d04e4 (patch) | |
tree | 033dbe065c24563d6cd21ae2c10af8833eac79d9 /arch/x86/kvm | |
parent | eb787d10af8045dd00d4d4c9a8e90fa495f1b0c1 (diff) |
KVM: MMU: Merge shadow level check in FNAME(fetch)
Remove the redundant level check when fetching
shadow pte for present & non-present spte.
Signed-off-by: Yaozu (Eddie) Dong <eddie.dong@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 349920556be3..03ba8608fe0f 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h | |||
@@ -300,16 +300,13 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, | |||
300 | bool new_page = 0; | 300 | bool new_page = 0; |
301 | 301 | ||
302 | shadow_ent = ((u64 *)__va(shadow_addr)) + index; | 302 | shadow_ent = ((u64 *)__va(shadow_addr)) + index; |
303 | if (level == PT_PAGE_TABLE_LEVEL) | ||
304 | break; | ||
303 | if (is_shadow_present_pte(*shadow_ent)) { | 305 | if (is_shadow_present_pte(*shadow_ent)) { |
304 | if (level == PT_PAGE_TABLE_LEVEL) | ||
305 | break; | ||
306 | shadow_addr = *shadow_ent & PT64_BASE_ADDR_MASK; | 306 | shadow_addr = *shadow_ent & PT64_BASE_ADDR_MASK; |
307 | continue; | 307 | continue; |
308 | } | 308 | } |
309 | 309 | ||
310 | if (level == PT_PAGE_TABLE_LEVEL) | ||
311 | break; | ||
312 | |||
313 | if (level - 1 == PT_PAGE_TABLE_LEVEL | 310 | if (level - 1 == PT_PAGE_TABLE_LEVEL |
314 | && walker->level == PT_DIRECTORY_LEVEL) { | 311 | && walker->level == PT_DIRECTORY_LEVEL) { |
315 | metaphysical = 1; | 312 | metaphysical = 1; |