summaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorChristoffer Dall <c.dall@virtualopensystems.com>2012-06-15 15:07:13 -0400
committerAvi Kivity <avi@redhat.com>2012-06-18 16:06:35 +0300
commita1e4ccb990447df0fe83d164d9a7bc2e6c4b7db7 (patch)
tree2068a67dbcf1d34455956c9ecd416aa2a3e2b1e1 /include/trace
parent9900b4b48b095895cf962054e45aafa49ef70f74 (diff)
downloadop-kernel-dev-a1e4ccb990447df0fe83d164d9a7bc2e6c4b7db7.zip
op-kernel-dev-a1e4ccb990447df0fe83d164d9a7bc2e6c4b7db7.tar.gz
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: Christoffer Dall <c.dall@virtualopensystems.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/events/kvm.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index 3df5925..7ef9e75 100644
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -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"}, \
OpenPOWER on IntegriCloud