Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1e4ccb9 authored by Christoffer Dall's avatar Christoffer Dall Committed by Avi Kivity
Browse files

KVM: Introduce __KVM_HAVE_IRQ_LINE 



This is a preparatory patch for the KVM/ARM implementation. KVM/ARM will use
the KVM_IRQ_LINE ioctl, which is currently conditional on
__KVM_HAVE_IOAPIC, but ARM obviously doesn't have any IOAPIC support and we
need a separate define.

Signed-off-by: default avatarChristoffer Dall <c.dall@virtualopensystems.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 9900b4b4

arch/ia64/include/asm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


/* Select x86 specific features in <linux/kvm.h> */

#define __KVM_HAVE_IOAPIC

#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_DEVICE_ASSIGNMENT



/* Architectural interrupt line count. */

arch/x86/include/asm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
/* Select x86 specific features in <linux/kvm.h> */

#define __KVM_HAVE_PIT

#define __KVM_HAVE_IOAPIC

#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_DEVICE_ASSIGNMENT

#define __KVM_HAVE_MSI

#define __KVM_HAVE_USER_NMI

include/trace/events/kvm.h

+3 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ TRACE_EVENT(kvm_userspace_exit, 
		  __entry->errno < 0 ? -__entry->errno : __entry->reason)

);



#if defined(__KVM_HAVE_IOAPIC)

#if defined(__KVM_HAVE_IRQ_LINE)

TRACE_EVENT(kvm_set_irq,

	TP_PROTO(unsigned int gsi, int level, int irq_source_id),

	TP_ARGS(gsi, level, irq_source_id),
@@ -57,7 +57,9 @@ TRACE_EVENT(kvm_set_irq, 
	TP_printk("gsi %u level %d source %d",

		  __entry->gsi, __entry->level, __entry->irq_source_id)

);

#endif



#if defined(__KVM_HAVE_IOAPIC)

#define kvm_deliver_mode		\

	{0x0, "Fixed"},			\

	{0x1, "LowPrio"},		\