diff options
| author | Takuya Yoshikawa | 2011-06-30 18:36:07 +0200 |
|---|---|---|
| committer | Avi Kivity | 2011-07-12 12:16:43 +0200 |
| commit | 92c1c1e85bdd72b41f9fd39b9d43d4b3c146d02d (patch) | |
| tree | c754a7a47d3a9733ac9bfdb5b68ff2d6889d39b9 /arch/x86/kvm | |
| parent | KVM: MMU: Clean up the error handling of walk_addr_generic() (diff) | |
| download | kernel-qcow2-linux-92c1c1e85bdd72b41f9fd39b9d43d4b3c146d02d.tar.gz kernel-qcow2-linux-92c1c1e85bdd72b41f9fd39b9d43d4b3c146d02d.tar.xz kernel-qcow2-linux-92c1c1e85bdd72b41f9fd39b9d43d4b3c146d02d.zip | |
KVM: MMU: Rename the walk label in walk_addr_generic()
The current name does not explain the meaning well. So give it a better
name "retry_walk" to show that we are trying the walk again.
This was suggested by Ingo Molnar.
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index f0746d27e33e..9c0afba1ab8e 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -134,7 +134,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, trace_kvm_mmu_pagetable_walk(addr, write_fault, user_fault, fetch_fault); -walk: +retry_walk: eperm = false; walker->level = mmu->root_level; pte = mmu->get_cr3(vcpu); @@ -211,7 +211,7 @@ walk: if (unlikely(ret < 0)) goto error; else if (ret) - goto walk; + goto retry_walk; mark_page_dirty(vcpu->kvm, table_gfn); pte |= PT_ACCESSED_MASK; @@ -277,7 +277,7 @@ walk: if (unlikely(ret < 0)) goto error; else if (ret) - goto walk; + goto retry_walk; mark_page_dirty(vcpu->kvm, table_gfn); pte |= PT_DIRTY_MASK; |