KVM: x86: Fold emulator_write_phys() into write_emulate()

Fold emulator_write_phys() into write_emulate() to drop a superfluous
wrapper, and to provide more symmetry between the read and write paths.

No functional change intended.

Tested-by: Tom Lendacky <thomas.lendacky@gmail.com>
Tested-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Link: https://patch.msgid.link/20260225012049.920665-12-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index ff07c45e3c731a2833b472faca4262ac4af19a5b..aa030fbd669dd2ed8fa6290ac2481d60570fb4e5 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -2097,9 +2097,6 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end);
 
 int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3);
 
-int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,
-                         const void *val, int bytes);
-
 extern bool tdp_enabled;
 
 u64 vcpu_tsc_khz(struct kvm_vcpu *vcpu);

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index abc4ec06c548065fe2b1083925a40634a30aea96..0195b77710e6a546dd7f29183dc97f05be8f43bd 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -8101,18 +8101,6 @@ static int vcpu_mmio_gva_to_gpa(struct kvm_vcpu *vcpu, unsigned long gva,
        return vcpu_is_mmio_gpa(vcpu, gva, *gpa, write);
 }
 
-int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,
-                       const void *val, int bytes)
-{
-       int ret;
-
-       ret = kvm_vcpu_write_guest(vcpu, gpa, val, bytes);
-       if (ret < 0)
-               return 0;
-       kvm_page_track_write(vcpu, gpa, val, bytes);
-       return 1;
-}
-
 struct read_write_emulator_ops {
        int (*read_write_emulate)(struct kvm_vcpu *vcpu, gpa_t gpa,
                                  void *val, int bytes);
@@ -8130,7 +8118,13 @@ static int read_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
 static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
                         void *val, int bytes)
 {
-       return emulator_write_phys(vcpu, gpa, val, bytes);
+       int ret;
+
+       ret = kvm_vcpu_write_guest(vcpu, gpa, val, bytes);
+       if (ret < 0)
+               return 0;
+       kvm_page_track_write(vcpu, gpa, val, bytes);
+       return 1;
 }
 
 static int emulator_read_write_onepage(unsigned long addr, void *val,