evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KVM: Introduce __KVM_HAVE_IRQ_LINE

Browse source 
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: Christoffer Dall <c.dall@virtualopensystems.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Christoffer Dall 2012-06-15 15:07:13 -04:00 • committed by Avi Kivity
parent 9900b4b48b
commit a1e4ccb990
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/ia64/include/asm/kvm.h
View file

@ -26,6 +26,7 @@
/* Select x86 specific features in <linux/kvm.h> */ /* Select x86 specific features in <linux/kvm.h> */
#define __KVM_HAVE_IOAPIC #define __KVM_HAVE_IOAPIC
#define __KVM_HAVE_IRQ_LINE
#define __KVM_HAVE_DEVICE_ASSIGNMENT #define __KVM_HAVE_DEVICE_ASSIGNMENT
/* Architectural interrupt line count. */ /* Architectural interrupt line count. */

1
arch/x86/include/asm/kvm.h
View file

@ -12,6 +12,7 @@
/* Select x86 specific features in <linux/kvm.h> */ /* Select x86 specific features in <linux/kvm.h> */
#define __KVM_HAVE_PIT #define __KVM_HAVE_PIT
#define __KVM_HAVE_IOAPIC #define __KVM_HAVE_IOAPIC
#define __KVM_HAVE_IRQ_LINE
#define __KVM_HAVE_DEVICE_ASSIGNMENT #define __KVM_HAVE_DEVICE_ASSIGNMENT
#define __KVM_HAVE_MSI #define __KVM_HAVE_MSI
#define __KVM_HAVE_USER_NMI #define __KVM_HAVE_USER_NMI

4
include/trace/events/kvm.h
View file

@ -37,7 +37,7 @@ TRACE_EVENT(kvm_userspace_exit,
__entry->errno < 0 ? -__entry->errno : __entry->reason) __entry->errno < 0 ? -__entry->errno : __entry->reason)
); );
#if defined(__KVM_HAVE_IOAPIC) #if defined(__KVM_HAVE_IRQ_LINE)
TRACE_EVENT(kvm_set_irq, TRACE_EVENT(kvm_set_irq,
TP_PROTO(unsigned int gsi, int level, int irq_source_id), TP_PROTO(unsigned int gsi, int level, int irq_source_id),
TP_ARGS(gsi, level, 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", TP_printk("gsi %u level %d source %d",
__entry->gsi, __entry->level, __entry->irq_source_id) __entry->gsi, __entry->level, __entry->irq_source_id)
); );
#endif
#if defined(__KVM_HAVE_IOAPIC)
#define kvm_deliver_mode \ #define kvm_deliver_mode \
{0x0, "Fixed"}, \ {0x0, "Fixed"}, \
{0x1, "LowPrio"}, \ {0x1, "LowPrio"}, \