---

yaml --- r: 80779 b: refs/heads/master c: 0d81f29 h: refs/heads/master i: 80777: 49c0efb 80775: c426cad v: v3
git-mirror · Jan 30, 2008 · 78877b6 · 78877b6
1 parent 5abae95
commit 78877b6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f3e7124f66df2d36751b0c97eabe38a13752fff
+refs/heads/master: 0d81f2966a61953c4cc7397342f5f907b3a6e257
diff --git a/trunk/drivers/kvm/kvm.h b/trunk/drivers/kvm/kvm.h
@@ -379,7 +379,6 @@ hpa_t gpa_to_hpa(struct kvm *kvm, gpa_t gpa);
 #define HPA_MSB ((sizeof(hpa_t) * 8) - 1)
 #define HPA_ERR_MASK ((hpa_t)1 << HPA_MSB)
 static inline int is_error_hpa(hpa_t hpa) { return hpa >> HPA_MSB; }
-hpa_t gva_to_hpa(struct kvm_vcpu *vcpu, gva_t gva);
 struct page *gva_to_page(struct kvm_vcpu *vcpu, gva_t gva);
 
 extern struct page *bad_page;

diff --git a/trunk/drivers/kvm/mmu.c b/trunk/drivers/kvm/mmu.c
@@ -881,15 +881,6 @@ hpa_t gpa_to_hpa(struct kvm *kvm, gpa_t gpa)
 	return hpa;
 }
 
-hpa_t gva_to_hpa(struct kvm_vcpu *vcpu, gva_t gva)
-{
-	gpa_t gpa = vcpu->mmu.gva_to_gpa(vcpu, gva);
-
-	if (gpa == UNMAPPED_GVA)
-		return UNMAPPED_GVA;
-	return gpa_to_hpa(vcpu->kvm, gpa);
-}
-
 struct page *gva_to_page(struct kvm_vcpu *vcpu, gva_t gva)
 {
 	gpa_t gpa = vcpu->mmu.gva_to_gpa(vcpu, gva);