KVM: x86: Rename lapic set/clear vector helpers

In preparation for moving kvm-internal kvm_lapic_set_vector(),
kvm_lapic_clear_vector() 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-10-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 b7a9d7037cab32cf70409289438631a63e5adb71..27cc8dc1514e0eedd1814c15f9330545e23be89c 100644 (file)
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -718,10 +718,10 @@ static inline int apic_find_highest_irr(struct kvm_lapic *apic)
 static inline void apic_clear_irr(int vec, struct kvm_lapic *apic)
 {
        if (unlikely(apic->apicv_active)) {
-               kvm_lapic_clear_vector(vec, apic->regs + APIC_IRR);
+               apic_clear_vector(vec, apic->regs + APIC_IRR);
        } else {
                apic->irr_pending = false;
-               kvm_lapic_clear_vector(vec, apic->regs + APIC_IRR);
+               apic_clear_vector(vec, apic->regs + APIC_IRR);
                if (apic_search_irr(apic) != -1)
                        apic->irr_pending = true;
        }
@@ -1328,11 +1328,9 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,
 
                if (apic_test_vector(vector, apic->regs + APIC_TMR) != !!trig_mode) {
                        if (trig_mode)
-                               kvm_lapic_set_vector(vector,
-                                                    apic->regs + APIC_TMR);
+                               apic_set_vector(vector, apic->regs + APIC_TMR);
                        else
-                               kvm_lapic_clear_vector(vector,
-                                                      apic->regs + APIC_TMR);
+                               apic_clear_vector(vector, apic->regs + APIC_TMR);
                }
 
                kvm_x86_call(deliver_interrupt)(apic, delivery_mode,

diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index a49e4c21db359ac75a3eb77514fc8dc41dbe0c90..c7babae8af83f1ea6304369bd5152dac2809bf08 100644 (file)
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -145,19 +145,19 @@ void kvm_lapic_exit(void);
 
 u64 kvm_lapic_readable_reg_mask(struct kvm_lapic *apic);
 
-static inline void kvm_lapic_clear_vector(int vec, void *bitmap)
+static inline void apic_clear_vector(int vec, void *bitmap)
 {
        clear_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSET(vec));
 }
 
-static inline void kvm_lapic_set_vector(int vec, void *bitmap)
+static inline void apic_set_vector(int vec, void *bitmap)
 {
        set_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSET(vec));
 }
 
 static inline void kvm_lapic_set_irr(int vec, struct kvm_lapic *apic)
 {
-       kvm_lapic_set_vector(vec, apic->regs + APIC_IRR);
+       apic_set_vector(vec, apic->regs + APIC_IRR);
        /*
         * irr_pending must be true if any interrupt is pending; set it after
         * APIC_IRR to avoid race with apic_clear_irr