Commit dcf0926e authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

x86: replace CONFIG_HAVE_KVM with IS_ENABLED(CONFIG_KVM) 



It is more accurate to check if KVM is enabled, instead of having the
architecture say so.  Architectures always "have" KVM, so for example
checking CONFIG_HAVE_KVM in x86 code is pointless, but if KVM is disabled
in a specific build, there is no need for support code.

Alternatively, many of the #ifdefs could simply be deleted.  However,
this would add completely dead code.  For example, when KVM is disabled,
there should not be any posted interrupts, i.e. NOT wiring up the "dummy"
handlers and treating IRQs on those vectors as spurious is the right
thing to do.

Cc: x86@kernel.org
Cc: kbingham@kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a6d54338

arch/x86/include/asm/hardirq.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ typedef struct { 
	unsigned int irq_spurious_count;

	unsigned int icr_read_retry_count;

#endif

#ifdef CONFIG_HAVE_KVM

#if IS_ENABLED(CONFIG_KVM)

	unsigned int kvm_posted_intr_ipis;

	unsigned int kvm_posted_intr_wakeup_ipis;

	unsigned int kvm_posted_intr_nested_ipis;

arch/x86/include/asm/idtentry.h

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ DECLARE_IDTENTRY_SYSVEC(IRQ_WORK_VECTOR, sysvec_irq_work); 
# endif

#endif



#ifdef CONFIG_HAVE_KVM

#if IS_ENABLED(CONFIG_KVM)

DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_VECTOR,		sysvec_kvm_posted_intr_ipi);

DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_WAKEUP_VECTOR,	sysvec_kvm_posted_intr_wakeup_ipi);

DECLARE_IDTENTRY_SYSVEC(POSTED_INTR_NESTED_VECTOR,	sysvec_kvm_posted_intr_nested_ipi);

arch/x86/include/asm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct irq_desc; 


extern void fixup_irqs(void);



#ifdef CONFIG_HAVE_KVM

#if IS_ENABLED(CONFIG_KVM)

extern void kvm_set_posted_intr_wakeup_handler(void (*handler)(void));

#endif

arch/x86/include/asm/irq_vectors.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 
#define HYPERVISOR_CALLBACK_VECTOR	0xf3



/* Vector for KVM to deliver posted interrupt IPI */

#ifdef CONFIG_HAVE_KVM

#if IS_ENABLED(CONFIG_KVM)

#define POSTED_INTR_VECTOR		0xf2

#define POSTED_INTR_WAKEUP_VECTOR	0xf1

#define POSTED_INTR_NESTED_VECTOR	0xf0

arch/x86/kernel/idt.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static const __initconst struct idt_data apic_idts[] = { 
#ifdef CONFIG_X86_LOCAL_APIC

	INTG(LOCAL_TIMER_VECTOR,		asm_sysvec_apic_timer_interrupt),

	INTG(X86_PLATFORM_IPI_VECTOR,		asm_sysvec_x86_platform_ipi),

# ifdef CONFIG_HAVE_KVM

# if IS_ENABLED(CONFIG_KVM)

	INTG(POSTED_INTR_VECTOR,		asm_sysvec_kvm_posted_intr_ipi),

	INTG(POSTED_INTR_WAKEUP_VECTOR,		asm_sysvec_kvm_posted_intr_wakeup_ipi),

	INTG(POSTED_INTR_NESTED_VECTOR,		asm_sysvec_kvm_posted_intr_nested_ipi),