From 78877b679510cd54ce3f69aa65bd63d5ef06c477 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Wed, 21 Nov 2007 14:57:44 +0200
Subject: [PATCH] --- yaml --- r: 80779 b: refs/heads/master c:
 0d81f2966a61953c4cc7397342f5f907b3a6e257 h: refs/heads/master i:   80777:
 49c0efbb4fd8dbe2ee6f7d3bf42aaef5e1f63f74   80775:
 c426cadab4ce1f6b0d36d7c7c37a7f4fca00dbc5 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/kvm/kvm.h | 1 -
 trunk/drivers/kvm/mmu.c | 9 ---------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 800c3cc4061c..bf92204872c3 100644
--- 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
index eda82cded88e..31315bcf09c3 100644
--- 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
index 1965185bbe23..6aa0319ede4d 100644
--- 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);