From fe95dc76a778c74f826bf2d96de7023783039ece Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Tue, 13 Jul 2010 14:27:04 +0300
Subject: [PATCH] --- yaml --- r: 202407 b: refs/heads/master c:
 32ef26a3598636be520abed90ed0c2f439d36bbe h: refs/heads/master i:   202405:
 6c7a191b79871b23df8a51a898d99a8043cd0834   202403:
 0646820b60cf7f9129381512f1b779095b8720bc   202399:
 b5fa828f57b98ba95f1b019e25e68f38a37c5fd9 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86/kvm/mmu.c         | 10 ++++++++++
 trunk/arch/x86/kvm/paging_tmpl.h |  7 ++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fcf2bcc269de..ff51f5c0cedb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a994358b919c3b14de61be5e30d9edc9089ba3f
+refs/heads/master: 32ef26a3598636be520abed90ed0c2f439d36bbe
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
index 89d7a2cae53b..df3a7a79cce3 100644
--- a/trunk/arch/x86/kvm/mmu.c
+++ b/trunk/arch/x86/kvm/mmu.c
@@ -1482,6 +1482,16 @@ static void shadow_walk_next(struct kvm_shadow_walk_iterator *iterator)
 	--iterator->level;
 }
 
+static void link_shadow_page(u64 *sptep, struct kvm_mmu_page *sp)
+{
+	u64 spte;
+
+	spte = __pa(sp->spt)
+		| PT_PRESENT_MASK | PT_ACCESSED_MASK
+		| PT_WRITABLE_MASK | PT_USER_MASK;
+	*sptep = spte;
+}
+
 static void kvm_mmu_page_unlink_children(struct kvm *kvm,
 					 struct kvm_mmu_page *sp)
 {
diff --git a/trunk/arch/x86/kvm/paging_tmpl.h b/trunk/arch/x86/kvm/paging_tmpl.h
index 1cea41cad069..36dc0749c878 100644
--- a/trunk/arch/x86/kvm/paging_tmpl.h
+++ b/trunk/arch/x86/kvm/paging_tmpl.h
@@ -309,7 +309,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
 {
 	unsigned access = gw->pt_access;
 	struct kvm_mmu_page *sp;
-	u64 spte, *sptep = NULL;
+	u64 *sptep = NULL;
 	int direct;
 	gfn_t table_gfn;
 	int r;
@@ -395,10 +395,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
 			}
 		}
 
-		spte = __pa(sp->spt)
-			| PT_PRESENT_MASK | PT_ACCESSED_MASK
-			| PT_WRITABLE_MASK | PT_USER_MASK;
-		*sptep = spte;
+		link_shadow_page(sptep, sp);
 	}
 
 	return sptep;