Commit 225bbf44 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers UAPI: Sync linux/kvm.h with the kernel sources 

To pick the changes in:

  89d01306 ("RISC-V: KVM: Implement device interface for AIA irqchip")
  22725266 ("KVM: Fix comment for KVM_ENABLE_CAP")
  2f440b72 ("KVM: arm64: Add KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE")

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 <apatel@ventanamicro.com>
Cc: Binbin Wu <binbin.wu@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Ricardo Koller <ricarkol@google.com>
Cc: Sean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/lkml/ZK12+virXMIXMysy@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 48fa42c9

tools/include/uapi/linux/kvm.h

+5 −1
Original line number Diff line number Diff line
@@ -1190,6 +1190,8 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 225

#define KVM_CAP_PMU_EVENT_MASKED_EVENTS 226

#define KVM_CAP_COUNTER_OFFSET 227

#define KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE 228

#define KVM_CAP_ARM_SUPPORTED_BLOCK_SIZES 229



#ifdef KVM_CAP_IRQ_ROUTING
@@ -1442,6 +1444,8 @@ enum kvm_device_type { 
#define KVM_DEV_TYPE_XIVE		KVM_DEV_TYPE_XIVE

	KVM_DEV_TYPE_ARM_PV_TIME,

#define KVM_DEV_TYPE_ARM_PV_TIME	KVM_DEV_TYPE_ARM_PV_TIME

	KVM_DEV_TYPE_RISCV_AIA,

#define KVM_DEV_TYPE_RISCV_AIA		KVM_DEV_TYPE_RISCV_AIA

	KVM_DEV_TYPE_MAX,

};
@@ -1613,7 +1617,7 @@ struct kvm_s390_ucas_mapping { 
#define KVM_GET_DEBUGREGS         _IOR(KVMIO,  0xa1, struct kvm_debugregs)

#define KVM_SET_DEBUGREGS         _IOW(KVMIO,  0xa2, struct kvm_debugregs)

/*

 * vcpu version available with KVM_ENABLE_CAP

 * vcpu version available with KVM_CAP_ENABLE_CAP

 * vm version available with KVM_CAP_ENABLE_CAP_VM

 */

#define KVM_ENABLE_CAP            _IOW(KVMIO,  0xa3, struct kvm_enable_cap)