KVM: x86: Rename lapic get/set_reg64() helpers

In preparation for moving kvm-internal __kvm_lapic_set_reg64(),
__kvm_lapic_get_reg64() to apic.h for use in Secure AVIC APIC driver,
rename them as part of the APIC API.

No functional change intended.

Signed-off-by: Neeraj Upadhyay <Neeraj.Upadhyay@amd.com>
Acked-by: Sean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20250709033242.267892-9-Neeraj.Upadhyay@amd.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 436e0b0c829ec3ca0b1d37630232fed3bdc712cd..b7a9d7037cab32cf70409289438631a63e5adb71 100644 (file)
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -89,7 +89,7 @@ static inline void kvm_lapic_set_reg(struct kvm_lapic *apic, int reg_off, u32 va
        apic_set_reg(apic->regs, reg_off, val);
 }
 
-static __always_inline u64 __kvm_lapic_get_reg64(void *regs, int reg)
+static __always_inline u64 apic_get_reg64(void *regs, int reg)
 {
        BUILD_BUG_ON(reg != APIC_ICR);
        return *((u64 *) (regs + reg));
@@ -97,10 +97,10 @@ static __always_inline u64 __kvm_lapic_get_reg64(void *regs, int reg)
 
 static __always_inline u64 kvm_lapic_get_reg64(struct kvm_lapic *apic, int reg)
 {
-       return __kvm_lapic_get_reg64(apic->regs, reg);
+       return apic_get_reg64(apic->regs, reg);
 }
 
-static __always_inline void __kvm_lapic_set_reg64(void *regs, int reg, u64 val)
+static __always_inline void apic_set_reg64(void *regs, int reg, u64 val)
 {
        BUILD_BUG_ON(reg != APIC_ICR);
        *((u64 *) (regs + reg)) = val;
@@ -109,7 +109,7 @@ static __always_inline void __kvm_lapic_set_reg64(void *regs, int reg, u64 val)
 static __always_inline void kvm_lapic_set_reg64(struct kvm_lapic *apic,
                                                int reg, u64 val)
 {
-       __kvm_lapic_set_reg64(apic->regs, reg, val);
+       apic_set_reg64(apic->regs, reg, val);
 }
 
 static inline int apic_test_vector(int vec, void *bitmap)
@@ -3082,9 +3082,9 @@ static int kvm_apic_state_fixup(struct kvm_vcpu *vcpu,
                        if (set) {
                                icr = apic_get_reg(s->regs, APIC_ICR) |
                                      (u64)apic_get_reg(s->regs, APIC_ICR2) << 32;
-                               __kvm_lapic_set_reg64(s->regs, APIC_ICR, icr);
+                               apic_set_reg64(s->regs, APIC_ICR, icr);
                        } else {
-                               icr = __kvm_lapic_get_reg64(s->regs, APIC_ICR);
+                               icr = apic_get_reg64(s->regs, APIC_ICR);
                                apic_set_reg(s->regs, APIC_ICR2, icr >> 32);
                        }
                }