Skip to content

Commit 474e76c

Browse files
committed
tools headers UAPI: Sync linux/kvm.h with the kernel sources
To pick the changes in: d495f94 ("KVM: fix bad user ABI for KVM_EXIT_SYSTEM_EVENT") That just rebuilds perf, as these patches don't add any new KVM ioctl to be harvested for the the 'perf trace' ioctl syscall argument beautifiers. This is also by now used by tools/testing/selftests/kvm/, a simple test build succeeded. This silences this perf build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/kvm.h' differs from latest version at 'include/uapi/linux/kvm.h' diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h Cc: Adrian Hunter <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paolo Bonzini <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 45fa7c3 commit 474e76c

File tree

1 file changed

+9
-1
lines changed
  • tools/include/uapi/linux

1 file changed

+9
-1
lines changed

tools/include/uapi/linux/kvm.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,13 @@ struct kvm_run {
445445
#define KVM_SYSTEM_EVENT_RESET 2
446446
#define KVM_SYSTEM_EVENT_CRASH 3
447447
__u32 type;
448-
__u64 flags;
448+
__u32 ndata;
449+
union {
450+
#ifndef __KERNEL__
451+
__u64 flags;
452+
#endif
453+
__u64 data[16];
454+
};
449455
} system_event;
450456
/* KVM_EXIT_S390_STSI */
451457
struct {
@@ -1144,6 +1150,8 @@ struct kvm_ppc_resize_hpt {
11441150
#define KVM_CAP_S390_MEM_OP_EXTENSION 211
11451151
#define KVM_CAP_PMU_CAPABILITY 212
11461152
#define KVM_CAP_DISABLE_QUIRKS2 213
1153+
/* #define KVM_CAP_VM_TSC_CONTROL 214 */
1154+
#define KVM_CAP_SYSTEM_EVENT_DATA 215
11471155

11481156
#ifdef KVM_CAP_IRQ_ROUTING
11491157

0 commit comments

Comments
 (0)