tools headers UAPI: Sync linux/kvm.h with the kernel sources
PATCH 1/1 tools headers UAPI: Sync linux/kvm.h with the kernel sources
To pick the changes in:
d495f942f40aa412 ("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
--- tools/include/uapi/linux/kvm.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
tools/include/uapi/linux/kvm.h +9 -1
@@ -445,7 +445,13 @@ struct kvm_run {#define KVM_SYSTEM_EVENT_RESET 2#define KVM_SYSTEM_EVENT_CRASH 3__u32 type; -__u64 flags; +__u32 ndata; +union { +#ifndef __KERNEL__ +__u64 flags; +#endif +__u64 data[16 ]; + }; } system_event;/* KVM_EXIT_S390_STSI */ struct {
@@ -1144,6 +1150,8 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_S390_MEM_OP_EXTENSION 211#define KVM_CAP_PMU_CAPABILITY 212#define KVM_CAP_DISABLE_QUIRKS2 213 +/* #define KVM_CAP_VM_TSC_CONTROL 214 */ +#define KVM_CAP_SYSTEM_EVENT_DATA 215#ifdef KVM_CAP_IRQ_ROUTING
Signature · 1 line
2.35.1
Em Tue, May 03, 2022 at 11:15:32AM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 3 lines
To pick the changes in:
d495f942f40aa412("KVM: fix bad user ABI forKVM_EXIT_SYSTEM_EVENT")
Ah, this is just FYI, I'm carrying it in the perf tools tree already.
- Arnaldo
Quoted 53 lines
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 -utools/include/uapi/linux/kvm.hinclude/uapi/linux/kvm.hCc Adrian Hunter <[email protected]>Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paolo Bonzini <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>--- tools/include/uapi/linux/kvm.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)tools/include/uapi/linux/kvm.h +9
-1@@ -445,7 +445,13 @@ struct kvm_run {#define KVM_SYSTEM_EVENT_RESET 2#define KVM_SYSTEM_EVENT_CRASH 3__u32 type; -__u64 flags; +__u32 ndata; +union { +#ifndef __KERNEL__ +__u64 flags; +#endif +__u64 data[16 ]; + }; } system_event;/* KVM_EXIT_S390_STSI */ struct {@@ -1144,6 +1150,8 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_S390_MEM_OP_EXTENSION 211#define KVM_CAP_PMU_CAPABILITY 212#define KVM_CAP_DISABLE_QUIRKS2 213 +/* #define KVM_CAP_VM_TSC_CONTROL 214 */ +#define KVM_CAP_SYSTEM_EVENT_DATA 215#ifdef KVM_CAP_IRQ_ROUTING Signature · 1 line
2.35.1
Signature · 1 line
- Arnaldo