From 7da7ccf5d20ff240e2eef3280000ce40f0ba6dd3 Mon Sep 17 00:00:00 2001
From: Eric Northup <digitaleric@google.com>
Date: Mon, 26 Apr 2010 17:00:05 -0700
Subject: [PATCH] --- yaml --- r: 197815 b: refs/heads/master c:
 5a7388c2d2faa2cc70c2d4717c8d7836d55459e0 h: refs/heads/master i:   197813:
 a37156efa8f9485d43f70cf44b0cdbd51233e9f7   197811:
 4755b18c2e0d9c1942060725f68a6c1d0a8a2fa9   197807:
 7304426994da721b8082652e51b4cf207e012dfc v: v3

---
 [refs]                   |  2 +-
 trunk/arch/x86/kvm/mmu.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3497759522bd..f80fbe3fd482 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4bd09b28907ca17cdb307c32bbcc9882c280feb
+refs/heads/master: 5a7388c2d2faa2cc70c2d4717c8d7836d55459e0
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
index ddfa8658fb6d..9696d654b01f 100644
--- a/trunk/arch/x86/kvm/mmu.c
+++ b/trunk/arch/x86/kvm/mmu.c
@@ -2059,10 +2059,12 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)
 		hpa_t root = vcpu->arch.mmu.root_hpa;
 
 		ASSERT(!VALID_PAGE(root));
-		if (tdp_enabled)
-			direct = 1;
 		if (mmu_check_root(vcpu, root_gfn))
 			return 1;
+		if (tdp_enabled) {
+			direct = 1;
+			root_gfn = 0;
+		}
 		sp = kvm_mmu_get_page(vcpu, root_gfn, 0,
 				      PT64_ROOT_LEVEL, direct,
 				      ACC_ALL, NULL);
@@ -2072,8 +2074,6 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)
 		return 0;
 	}
 	direct = !is_paging(vcpu);
-	if (tdp_enabled)
-		direct = 1;
 	for (i = 0; i < 4; ++i) {
 		hpa_t root = vcpu->arch.mmu.pae_root[i];
 
@@ -2089,6 +2089,10 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)
 			root_gfn = 0;
 		if (mmu_check_root(vcpu, root_gfn))
 			return 1;
+		if (tdp_enabled) {
+			direct = 1;
+			root_gfn = i << 30;
+		}
 		sp = kvm_mmu_get_page(vcpu, root_gfn, i << 30,
 				      PT32_ROOT_LEVEL, direct,
 				      ACC_ALL, NULL);