From: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Date: Thu, 30 Jun 2011 16:36:07 +0000 (+0900)
Subject: KVM: MMU: Rename the walk label in walk_addr_generic()
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=92c1c1e85bdd72b41f9fd39b9d43d4b3c146d02d;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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;