diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-20 14:19:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-20 14:19:10 +0100 |
| commit | 00d0c27229b894f66e468c8441b8f65d9b2196fa (patch) | |
| tree | b2f5ab26b1a42beb03e33fe8ada950f4259b7822 /include/trace | |
| parent | 95cdd9f6026c72b758c1075a401a946717b8d7bd (diff) | |
| parent | 814607cd40df80d5727957adaa857e0feca43497 (diff) | |
| download | linux-next-00d0c27229b894f66e468c8441b8f65d9b2196fa.tar.gz linux-next-00d0c27229b894f66e468c8441b8f65d9b2196fa.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/kvm.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h index b282e3a86769..07013f88e655 100644 --- a/include/trace/events/kvm.h +++ b/include/trace/events/kvm.h @@ -4,8 +4,14 @@ #include <linux/tracepoint.h> +#undef UNPACK_KVM +#define UNPACK_KVM(name) name #undef TRACE_SYSTEM -#define TRACE_SYSTEM kvm +#define TRACE_SYSTEM UNPACK_KVM(KVM_DEV_NAME) +#undef TRACE_SYSTEM_VAR +#define TRACE_SYSTEM_VAR kvm +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_FILE kvm #define ERSN(x) { KVM_EXIT_##x, "KVM_EXIT_" #x } @@ -358,13 +364,13 @@ TRACE_EVENT(kvm_dirty_ring_exit, TP_printk("vcpu %d", __entry->vcpu_id) ); -#ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES +#ifdef CONFIG_KVM_VM_MEMORY_ATTRIBUTES /* * @start: Starting address of guest memory range * @end: End address of guest memory range * @attr: The value of the attribute being set. */ -TRACE_EVENT(kvm_vm_set_mem_attributes, +TRACE_EVENT(kvm_set_vm_mem_attributes, TP_PROTO(gfn_t start, gfn_t end, unsigned long attr), TP_ARGS(start, end, attr), @@ -383,7 +389,7 @@ TRACE_EVENT(kvm_vm_set_mem_attributes, TP_printk("%#016llx -- %#016llx [0x%lx]", __entry->start, __entry->end, __entry->attr) ); -#endif /* CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES */ +#endif /* CONFIG_KVM_VM_MEMORY_ATTRIBUTES */ TRACE_EVENT(kvm_unmap_hva_range, TP_PROTO(unsigned long start, unsigned long end), |