Skip to content

Commit aa69783

Browse files
committed
tools headers UAPI: Sync linux/kvm.h with the kernel sources
To pick the changes in: 5b9db9c ("RISC-V: KVM: add KVM_CAP_RISCV_MP_STATE_RESET") a7484c8 ("KVM: arm64: Allow userspace to request KVM_ARM_VCPU_EL2*") 79462fa ("KVM: TDX: Handle TDG.VP.VMCALL<ReportFatalError>") 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 addresses this perf build warning: Warning: Kernel ABI header differences: diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Anup Patel <anup@brainfault.org> Cc: Binbin Wu <binbin.wu@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: James Clark <james.clark@linaro.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Marc Zyngier <maz@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Radim Krčmář <rkrcmar@ventanamicro.com> Link: https://lore.kernel.org/r/aEruUUJvR0bfCg7_@x1 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent c71bc59 commit aa69783

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

  • tools/include/uapi/linux

tools/include/uapi/linux/kvm.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ struct kvm_run {
375375
#define KVM_SYSTEM_EVENT_WAKEUP 4
376376
#define KVM_SYSTEM_EVENT_SUSPEND 5
377377
#define KVM_SYSTEM_EVENT_SEV_TERM 6
378+
#define KVM_SYSTEM_EVENT_TDX_FATAL 7
378379
__u32 type;
379380
__u32 ndata;
380381
union {
@@ -930,6 +931,9 @@ struct kvm_enable_cap {
930931
#define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237
931932
#define KVM_CAP_X86_GUEST_MODE 238
932933
#define KVM_CAP_ARM_WRITABLE_IMP_ID_REGS 239
934+
#define KVM_CAP_ARM_EL2 240
935+
#define KVM_CAP_ARM_EL2_E2H0 241
936+
#define KVM_CAP_RISCV_MP_STATE_RESET 242
933937

934938
struct kvm_irq_routing_irqchip {
935939
__u32 irqchip;

0 commit comments

Comments
 (0)