Skip to content

Commit 6f34372

Browse files
committed
KVM: x86: Rename kvm_set_msi_irq() => kvm_msi_to_lapic_irq()
Rename kvm_set_msi_irq() to kvm_msi_to_lapic_irq() to better capture what it actually does, e.g. it's _really_ easy to conflate kvm_set_msi_irq() with kvm_set_msi(). Opportunistically delete the public declaration and export, as they are no longer used/needed. No functional change intended. Link: https://lore.kernel.org/r/20250611224604.313496-64-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent b03500f commit 6f34372

2 files changed

Lines changed: 7 additions & 10 deletions

File tree

arch/x86/include/asm/kvm_host.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2382,9 +2382,6 @@ bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu);
23822382
bool kvm_intr_is_single_vcpu(struct kvm *kvm, struct kvm_lapic_irq *irq,
23832383
struct kvm_vcpu **dest_vcpu);
23842384

2385-
void kvm_set_msi_irq(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e,
2386-
struct kvm_lapic_irq *irq);
2387-
23882385
static inline bool kvm_irq_is_postable(struct kvm_lapic_irq *irq)
23892386
{
23902387
/* We can only post Fixed and LowPrio IRQs */

arch/x86/kvm/irq.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,9 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
252252
return r;
253253
}
254254

255-
void kvm_set_msi_irq(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e,
256-
struct kvm_lapic_irq *irq)
255+
static void kvm_msi_to_lapic_irq(struct kvm *kvm,
256+
struct kvm_kernel_irq_routing_entry *e,
257+
struct kvm_lapic_irq *irq)
257258
{
258259
struct msi_msg msg = { .address_lo = e->msi.address_lo,
259260
.address_hi = e->msi.address_hi,
@@ -271,7 +272,6 @@ void kvm_set_msi_irq(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e,
271272
irq->level = 1;
272273
irq->shorthand = APIC_DEST_NOSHORT;
273274
}
274-
EXPORT_SYMBOL_GPL(kvm_set_msi_irq);
275275

276276
static inline bool kvm_msi_route_invalid(struct kvm *kvm,
277277
struct kvm_kernel_irq_routing_entry *e)
@@ -290,7 +290,7 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,
290290
if (!level)
291291
return -1;
292292

293-
kvm_set_msi_irq(kvm, e, &irq);
293+
kvm_msi_to_lapic_irq(kvm, e, &irq);
294294

295295
return kvm_irq_delivery_to_apic(kvm, NULL, &irq, NULL);
296296
}
@@ -313,7 +313,7 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e,
313313
if (kvm_msi_route_invalid(kvm, e))
314314
return -EINVAL;
315315

316-
kvm_set_msi_irq(kvm, e, &irq);
316+
kvm_msi_to_lapic_irq(kvm, e, &irq);
317317

318318
if (kvm_irq_delivery_to_apic_fast(kvm, NULL, &irq, &r, NULL))
319319
return r;
@@ -486,7 +486,7 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,
486486
if (entry->type != KVM_IRQ_ROUTING_MSI)
487487
continue;
488488

489-
kvm_set_msi_irq(vcpu->kvm, entry, &irq);
489+
kvm_msi_to_lapic_irq(vcpu->kvm, entry, &irq);
490490

491491
if (!irq.trig_mode)
492492
continue;
@@ -521,7 +521,7 @@ static int kvm_pi_update_irte(struct kvm_kernel_irqfd *irqfd,
521521
return -EINVAL;
522522

523523
if (entry && entry->type == KVM_IRQ_ROUTING_MSI) {
524-
kvm_set_msi_irq(kvm, entry, &irq);
524+
kvm_msi_to_lapic_irq(kvm, entry, &irq);
525525

526526
/*
527527
* Force remapped mode if hardware doesn't support posting the

0 commit comments

Comments
 (0)