Skip to content

Commit 8a33b1f

Browse files
committed
KVM: x86: Drop superfluous kvm_set_pic_irq() => kvm_pic_set_irq() wrapper
Drop the superfluous and confusing kvm_set_pic_irq() => kvm_pic_set_irq() wrapper, and instead wire up ->set() directly to its final destination. Opportunistically move the declaration kvm_pic_set_irq() to irq.h to start gathering more of the in-kernel APIC/IO-APIC logic in irq.{c,h}. No functional change intended. Acked-by: Kai Huang <kai.huang@intel.com> Link: https://lore.kernel.org/r/20250611213557.294358-3-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent e295d2e commit 8a33b1f

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

arch/x86/include/asm/kvm_host.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,6 @@ static inline int __kvm_irq_line_state(unsigned long *irq_state,
22092209
return !!(*irq_state);
22102210
}
22112211

2212-
int kvm_pic_set_irq(struct kvm_pic *pic, int irq, int irq_source_id, int level);
22132212
void kvm_pic_clear_all(struct kvm_pic *pic, int irq_source_id);
22142213

22152214
void kvm_inject_nmi(struct kvm_vcpu *vcpu);

arch/x86/kvm/i8259.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,11 @@ void kvm_pic_update_irq(struct kvm_pic *s)
185185
pic_unlock(s);
186186
}
187187

188-
int kvm_pic_set_irq(struct kvm_pic *s, int irq, int irq_source_id, int level)
188+
int kvm_pic_set_irq(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm,
189+
int irq_source_id, int level, bool line_status)
189190
{
191+
struct kvm_pic *s = kvm->arch.vpic;
192+
int irq = e->irqchip.pin;
190193
int ret, irq_level;
191194

192195
BUG_ON(irq < 0 || irq >= PIC_NUM_PINS);

arch/x86/kvm/irq.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ int kvm_pic_init(struct kvm *kvm);
6363
void kvm_pic_destroy(struct kvm *kvm);
6464
int kvm_pic_read_irq(struct kvm *kvm);
6565
void kvm_pic_update_irq(struct kvm_pic *s);
66+
int kvm_pic_set_irq(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm,
67+
int irq_source_id, int level, bool line_status);
6668

6769
static inline int irqchip_split(struct kvm *kvm)
6870
{

arch/x86/kvm/irq_comm.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@
2727
#include "x86.h"
2828
#include "xen.h"
2929

30-
static int kvm_set_pic_irq(struct kvm_kernel_irq_routing_entry *e,
31-
struct kvm *kvm, int irq_source_id, int level,
32-
bool line_status)
33-
{
34-
struct kvm_pic *pic = kvm->arch.vpic;
35-
return kvm_pic_set_irq(pic, e->irqchip.pin, irq_source_id, level);
36-
}
37-
3830
static int kvm_set_ioapic_irq(struct kvm_kernel_irq_routing_entry *e,
3931
struct kvm *kvm, int irq_source_id, int level,
4032
bool line_status)
@@ -296,7 +288,7 @@ int kvm_set_routing_entry(struct kvm *kvm,
296288
case KVM_IRQCHIP_PIC_MASTER:
297289
if (ue->u.irqchip.pin >= PIC_NUM_PINS / 2)
298290
return -EINVAL;
299-
e->set = kvm_set_pic_irq;
291+
e->set = kvm_pic_set_irq;
300292
break;
301293
case KVM_IRQCHIP_IOAPIC:
302294
if (ue->u.irqchip.pin >= KVM_IOAPIC_NUM_PINS)

0 commit comments

Comments
 (0)