Skip to content

Commit c5a7019

Browse files
committed
KVM: x86: Rename irqchip_kernel() to irqchip_full()
Rename irqchip_kernel() to irqchip_full(), as "kernel" is very ambiguous due to the existence of split IRQ chip support, where only some of the "irqchip" is in emulated by the kernel/KVM. E.g. irqchip_kernel() often gets confused with irqchip_in_kernel(). Opportunistically hoist the definition up in irq.h so that it's co-located with other "full" irqchip code in anticipation of wrapping it all with a Kconfig/#ifdef. No functional change intended. Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Acked-by: Kai Huang <kai.huang@intel.com> Link: https://lore.kernel.org/r/20250611213557.294358-8-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent b771b16 commit c5a7019

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

arch/x86/kvm/ioapic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ do { \
103103

104104
static inline int ioapic_in_kernel(struct kvm *kvm)
105105
{
106-
return irqchip_kernel(kvm);
106+
return irqchip_full(kvm);
107107
}
108108

109109
void kvm_rtc_eoi_tracking_restore_one(struct kvm_vcpu *vcpu);

arch/x86/kvm/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ bool kvm_arch_irqfd_allowed(struct kvm *kvm, struct kvm_irqfd *args)
172172
{
173173
bool resample = args->flags & KVM_IRQFD_FLAG_RESAMPLE;
174174

175-
return resample ? irqchip_kernel(kvm) : irqchip_in_kernel(kvm);
175+
return resample ? irqchip_full(kvm) : irqchip_in_kernel(kvm);
176176
}
177177

178178
bool kvm_arch_irqchip_in_kernel(struct kvm *kvm)

arch/x86/kvm/irq.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,27 +69,27 @@ int kvm_pic_set_irq(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm,
6969
int kvm_vm_ioctl_get_irqchip(struct kvm *kvm, struct kvm_irqchip *chip);
7070
int kvm_vm_ioctl_set_irqchip(struct kvm *kvm, struct kvm_irqchip *chip);
7171

72-
static inline int irqchip_split(struct kvm *kvm)
72+
static inline int irqchip_full(struct kvm *kvm)
7373
{
7474
int mode = kvm->arch.irqchip_mode;
7575

7676
/* Matches smp_wmb() when setting irqchip_mode */
7777
smp_rmb();
78-
return mode == KVM_IRQCHIP_SPLIT;
78+
return mode == KVM_IRQCHIP_KERNEL;
79+
}
80+
81+
static inline int pic_in_kernel(struct kvm *kvm)
82+
{
83+
return irqchip_full(kvm);
7984
}
8085

81-
static inline int irqchip_kernel(struct kvm *kvm)
86+
static inline int irqchip_split(struct kvm *kvm)
8287
{
8388
int mode = kvm->arch.irqchip_mode;
8489

8590
/* Matches smp_wmb() when setting irqchip_mode */
8691
smp_rmb();
87-
return mode == KVM_IRQCHIP_KERNEL;
88-
}
89-
90-
static inline int pic_in_kernel(struct kvm *kvm)
91-
{
92-
return irqchip_kernel(kvm);
92+
return mode == KVM_IRQCHIP_SPLIT;
9393
}
9494

9595
static inline int irqchip_in_kernel(struct kvm *kvm)

arch/x86/kvm/irq_comm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id)
200200
goto unlock;
201201
}
202202
clear_bit(irq_source_id, &kvm->arch.irq_sources_bitmap);
203-
if (!irqchip_kernel(kvm))
203+
if (!irqchip_full(kvm))
204204
goto unlock;
205205

206206
kvm_ioapic_clear_all(kvm->arch.vioapic, irq_source_id);

arch/x86/kvm/x86.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7039,7 +7039,7 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
70397039
}
70407040

70417041
r = -ENXIO;
7042-
if (!irqchip_kernel(kvm))
7042+
if (!irqchip_full(kvm))
70437043
goto get_irqchip_out;
70447044
r = kvm_vm_ioctl_get_irqchip(kvm, chip);
70457045
if (r)
@@ -7063,7 +7063,7 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
70637063
}
70647064

70657065
r = -ENXIO;
7066-
if (!irqchip_kernel(kvm))
7066+
if (!irqchip_full(kvm))
70677067
goto set_irqchip_out;
70687068
r = kvm_vm_ioctl_set_irqchip(kvm, chip);
70697069
set_irqchip_out:

0 commit comments

Comments
 (0)