Skip to content

Commit adfec1f

Browse files
committed
KVM: x86: Inline kvm_get_apic_mode() in lapic.h
Inline kvm_get_apic_mode() in lapic.h to avoid a CALL+RET as well as an export. The underlying kvm_apic_mode() helper is public information, i.e. there is no state/information that needs to be hidden from vendor modules. No functional change intended. Reviewed-by: Kai Huang <kai.huang@intel.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Link: https://lore.kernel.org/r/20241009181742.1128779-5-seanjc@google.com Link: https://lore.kernel.org/r/20241101183555.1794700-5-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent d91060e commit adfec1f

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

arch/x86/kvm/lapic.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ void kvm_apic_send_ipi(struct kvm_lapic *apic, u32 icr_low, u32 icr_high);
120120
int kvm_set_apic_base(struct kvm_vcpu *vcpu, struct msr_data *msr_info);
121121
int kvm_apic_get_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s);
122122
int kvm_apic_set_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s);
123-
enum lapic_mode kvm_get_apic_mode(struct kvm_vcpu *vcpu);
124123
int kvm_lapic_find_highest_irr(struct kvm_vcpu *vcpu);
125124

126125
u64 kvm_get_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu);
@@ -270,6 +269,11 @@ static inline enum lapic_mode kvm_apic_mode(u64 apic_base)
270269
return apic_base & (MSR_IA32_APICBASE_ENABLE | X2APIC_ENABLE);
271270
}
272271

272+
static inline enum lapic_mode kvm_get_apic_mode(struct kvm_vcpu *vcpu)
273+
{
274+
return kvm_apic_mode(vcpu->arch.apic_base);
275+
}
276+
273277
static inline u8 kvm_xapic_id(struct kvm_lapic *apic)
274278
{
275279
return kvm_lapic_get_reg(apic, APIC_ID) >> 24;

arch/x86/kvm/x86.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -668,12 +668,6 @@ static void drop_user_return_notifiers(void)
668668
kvm_on_user_return(&msrs->urn);
669669
}
670670

671-
enum lapic_mode kvm_get_apic_mode(struct kvm_vcpu *vcpu)
672-
{
673-
return kvm_apic_mode(vcpu->arch.apic_base);
674-
}
675-
EXPORT_SYMBOL_GPL(kvm_get_apic_mode);
676-
677671
int kvm_set_apic_base(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
678672
{
679673
enum lapic_mode old_mode = kvm_get_apic_mode(vcpu);

0 commit comments

Comments
 (0)