Skip to content

Commit b5f8980

Browse files
neerajupadhyasean-jc
authored andcommitted
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>
1 parent 9c23bc4 commit b5f8980

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

arch/x86/kvm/lapic.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -718,10 +718,10 @@ static inline int apic_find_highest_irr(struct kvm_lapic *apic)
718718
static inline void apic_clear_irr(int vec, struct kvm_lapic *apic)
719719
{
720720
if (unlikely(apic->apicv_active)) {
721-
kvm_lapic_clear_vector(vec, apic->regs + APIC_IRR);
721+
apic_clear_vector(vec, apic->regs + APIC_IRR);
722722
} else {
723723
apic->irr_pending = false;
724-
kvm_lapic_clear_vector(vec, apic->regs + APIC_IRR);
724+
apic_clear_vector(vec, apic->regs + APIC_IRR);
725725
if (apic_search_irr(apic) != -1)
726726
apic->irr_pending = true;
727727
}
@@ -1328,11 +1328,9 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,
13281328

13291329
if (apic_test_vector(vector, apic->regs + APIC_TMR) != !!trig_mode) {
13301330
if (trig_mode)
1331-
kvm_lapic_set_vector(vector,
1332-
apic->regs + APIC_TMR);
1331+
apic_set_vector(vector, apic->regs + APIC_TMR);
13331332
else
1334-
kvm_lapic_clear_vector(vector,
1335-
apic->regs + APIC_TMR);
1333+
apic_clear_vector(vector, apic->regs + APIC_TMR);
13361334
}
13371335

13381336
kvm_x86_call(deliver_interrupt)(apic, delivery_mode,

arch/x86/kvm/lapic.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,19 @@ void kvm_lapic_exit(void);
145145

146146
u64 kvm_lapic_readable_reg_mask(struct kvm_lapic *apic);
147147

148-
static inline void kvm_lapic_clear_vector(int vec, void *bitmap)
148+
static inline void apic_clear_vector(int vec, void *bitmap)
149149
{
150150
clear_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSET(vec));
151151
}
152152

153-
static inline void kvm_lapic_set_vector(int vec, void *bitmap)
153+
static inline void apic_set_vector(int vec, void *bitmap)
154154
{
155155
set_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSET(vec));
156156
}
157157

158158
static inline void kvm_lapic_set_irr(int vec, struct kvm_lapic *apic)
159159
{
160-
kvm_lapic_set_vector(vec, apic->regs + APIC_IRR);
160+
apic_set_vector(vec, apic->regs + APIC_IRR);
161161
/*
162162
* irr_pending must be true if any interrupt is pending; set it after
163163
* APIC_IRR to avoid race with apic_clear_irr

0 commit comments

Comments
 (0)