Messages in this thread | | | Date | Tue, 3 May 2022 11:16:10 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH 1/1] tools headers UAPI: Sync linux/kvm.h with the kernel sources |
| |
Em Tue, May 03, 2022 at 11:15:32AM -0300, Arnaldo Carvalho de Melo escreveu: > To pick the changes in: > > d495f942f40aa412 ("KVM: fix bad user ABI for KVM_EXIT_SYSTEM_EVENT")
Ah, this is just FYI, I'm carrying it in the perf tools tree already.
- Arnaldo
> 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 <adrian.hunter@intel.com> > Cc: Jiri Olsa <jolsa@kernel.org> > Cc: Namhyung Kim <namhyung@kernel.org> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Link: http://lore.kernel.org/lkml/ > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > --- > tools/include/uapi/linux/kvm.h | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h > index 91a6fe4e02c08c4b..6a184d260c7f2e17 100644 > --- a/tools/include/uapi/linux/kvm.h > +++ b/tools/include/uapi/linux/kvm.h > @@ -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 > > -- > 2.35.1 >
--
- Arnaldo
| |