Skip to content

Commit 225bbf4

Browse files
committed
tools headers UAPI: Sync linux/kvm.h with the kernel sources
To pick the changes in: 89d0130 ("RISC-V: KVM: Implement device interface for AIA irqchip") 2272526 ("KVM: Fix comment for KVM_ENABLE_CAP") 2f440b7 ("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 <[email protected]> Cc: Anup Patel <[email protected]> Cc: Binbin Wu <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Oliver Upton <[email protected]> Cc: Ricardo Koller <[email protected]> Cc: Sean Christopherson <[email protected]> Link: https://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 48fa42c commit 225bbf4

File tree

1 file changed

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

1 file changed

+5
-1
lines changed

tools/include/uapi/linux/kvm.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1190,6 +1190,8 @@ struct kvm_ppc_resize_hpt {
11901190
#define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 225
11911191
#define KVM_CAP_PMU_EVENT_MASKED_EVENTS 226
11921192
#define KVM_CAP_COUNTER_OFFSET 227
1193+
#define KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE 228
1194+
#define KVM_CAP_ARM_SUPPORTED_BLOCK_SIZES 229
11931195

11941196
#ifdef KVM_CAP_IRQ_ROUTING
11951197

@@ -1442,6 +1444,8 @@ enum kvm_device_type {
14421444
#define KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_XIVE
14431445
KVM_DEV_TYPE_ARM_PV_TIME,
14441446
#define KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_ARM_PV_TIME
1447+
KVM_DEV_TYPE_RISCV_AIA,
1448+
#define KVM_DEV_TYPE_RISCV_AIA KVM_DEV_TYPE_RISCV_AIA
14451449
KVM_DEV_TYPE_MAX,
14461450
};
14471451

@@ -1613,7 +1617,7 @@ struct kvm_s390_ucas_mapping {
16131617
#define KVM_GET_DEBUGREGS _IOR(KVMIO, 0xa1, struct kvm_debugregs)
16141618
#define KVM_SET_DEBUGREGS _IOW(KVMIO, 0xa2, struct kvm_debugregs)
16151619
/*
1616-
* vcpu version available with KVM_ENABLE_CAP
1620+
* vcpu version available with KVM_CAP_ENABLE_CAP
16171621
* vm version available with KVM_CAP_ENABLE_CAP_VM
16181622
*/
16191623
#define KVM_ENABLE_CAP _IOW(KVMIO, 0xa3, struct kvm_enable_cap)

0 commit comments

Comments
 (0)