KVM: x86: mmu: Move translate_gpa() to mmu.c

Mohammed Gamal · bonzini · commit cd313569f581 · 2020-07-10T13:09:40.000-04:00
Also no point of it being inline since it's always called through
function pointers. So remove that.

Signed-off-by: Mohammed Gamal &lt;mgamal@redhat.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
Message-Id: &lt;20200710154811.418214-3-mgamal@redhat.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
@@ -1510,12 +1510,6 @@ void kvm_mmu_new_pgd(struct kvm_vcpu *vcpu, gpa_t new_pgd, bool skip_tlb_flush,
 
 void kvm_configure_mmu(bool enable_tdp, int tdp_page_level);
 
-static inline gpa_t translate_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access,
-				  struct x86_exception *exception)
-{
-	return gpa;
-}
-
 static inline u16 kvm_read_ldt(void)
 {
 	u16 ldt;
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
@@ -516,6 +516,12 @@ static bool check_mmio_spte(struct kvm_vcpu *vcpu, u64 spte)
 	return likely(kvm_gen == spte_gen);
 }
 
+static gpa_t translate_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access,
+                                  struct x86_exception *exception)
+{
+        return gpa;
+}
+
 /*
  * Sets the shadow PTE masks used by the MMU.
  *

Original file line number	Diff line number	Diff line change
`@@ -516,6 +516,12 @@ static bool check_mmio_spte(struct kvm_vcpu *vcpu, u64 spte)`
`516`	`516`	`return likely(kvm_gen == spte_gen);`
`517`	`517`	`}`
`518`	`518`
	`519`	`+static gpa_t translate_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access,`
	`520`	`+ struct x86_exception *exception)`
	`521`	`+{`
	`522`	`+ return gpa;`
	`523`	`+}`
	`524`	`+`
`519`	`525`	`/*`
`520`	`526`	`* Sets the shadow PTE masks used by the MMU.`
`521`	`527`	`*`