Merge tag 'drm-intel-next-fixes-2016-08-05' of git://anongit.freedesktop.org/drm...

[deliverable/linux.git] / include / trace / events / kvm.h

diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index 526fb3d2e43a416fd14f47bc33b8f7e034426145..8ade3eb6c640e0725e2c1fe0d930e6309cd0801f 100644 (file)
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -108,7 +108,7 @@ TRACE_EVENT(kvm_ioapic_set_irq,
                __entry->coalesced      = coalesced;
        ),
 
-       TP_printk("pin %u dst %x vec=%u (%s|%s|%s%s)%s",
+       TP_printk("pin %u dst %x vec %u (%s|%s|%s%s)%s",
                  __entry->pin, (u8)(__entry->e >> 56), (u8)__entry->e,
                  __print_symbolic((__entry->e >> 8 & 0x7), kvm_deliver_mode),
                  (__entry->e & (1<<11)) ? "logical" : "physical",
@@ -129,7 +129,7 @@ TRACE_EVENT(kvm_ioapic_delayed_eoi_inj,
                __entry->e              = e;
        ),
 
-       TP_printk("dst %x vec=%u (%s|%s|%s%s)",
+       TP_printk("dst %x vec %u (%s|%s|%s%s)",
                  (u8)(__entry->e >> 56), (u8)__entry->e,
                  __print_symbolic((__entry->e >> 8 & 0x7), kvm_deliver_mode),
                  (__entry->e & (1<<11)) ? "logical" : "physical",
@@ -151,8 +151,9 @@ TRACE_EVENT(kvm_msi_set_irq,
                __entry->data           = data;
        ),
 
-       TP_printk("dst %u vec %x (%s|%s|%s%s)",
-                 (u8)(__entry->address >> 12), (u8)__entry->data,
+       TP_printk("dst %llx vec %u (%s|%s|%s%s)",
+                 (u8)(__entry->address >> 12) | ((__entry->address >> 32) & 0xffffff00),
+                 (u8)__entry->data,
                  __print_symbolic((__entry->data >> 8 & 0x7), kvm_deliver_mode),
                  (__entry->address & (1<<2)) ? "logical" : "physical",
                  (__entry->data & (1<<15)) ? "level" : "edge",