To pick up the changes in: af5366bea2cb9dfb KVM: x86: Drop the now unused KVM_X86_DISABLE_VALID_EXITS 915d2f0718a42ee0 KVM: Move KVM_REG_SIZE() definition to common uAPI header 5c17848134ab1ffb KVM: x86/xen: Restrict hypercall MSR to unofficial synthetic range 9364789567f9b492 KVM: x86: Add a VM type define for TDX fa662c9080732b1f KVM: SVM: Add Idle HLT intercept support 3adaee78306148da KVM: arm64: Allow userspace to change the implementation ID registers faf7714a47a25c62 KVM: arm64: nv: Allow userland to set VGIC maintenance IRQ c0000e58c74eed07 KVM: arm64: Introduce KVM_REG_ARM_VENDOR_HYP_BMAP_2 f83c41fb3dddbf47 KVM: arm64: Allow userspace to limit NV support to nVHE Addressing this perf tools build warning: Warning: Kernel ABI header differences: diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h diff -u tools/arch/x86/include/uapi/asm/svm.h arch/x86/include/uapi/asm/svm.h diff -u tools/arch/arm64/include/uapi/asm/kvm.h arch/arm64/include/uapi/asm/kvm.h Please see tools/include/uapi/README for further details.
Showing the changes to tools/include/uapi/linux (1 of 4 files). Show all
Unified · Split
| @@ -617,10 +617,6 @@ struct kvm_ioeventfd { · 616 unmodified lines | ||
| 617 | 617 | #define KVM_X86_DISABLE_EXITS_HLT (1 << 1) |
| 618 | 618 | #define KVM_X86_DISABLE_EXITS_PAUSE (1 << 2) |
| 619 | 619 | #define KVM_X86_DISABLE_EXITS_CSTATE (1 << 3) |
| 620 | −#define KVM_X86_DISABLE_VALID_EXITS (KVM_X86_DISABLE_EXITS_MWAIT | \ | |
| 621 | − KVM_X86_DISABLE_EXITS_HLT | \ | |
| 622 | − KVM_X86_DISABLE_EXITS_PAUSE | \ | |
| 623 | − KVM_X86_DISABLE_EXITS_CSTATE) | |
| 624 | 620 | |
| 625 | 621 | /* for KVM_ENABLE_CAP */ |
| 626 | 622 | struct kvm_enable_cap { |
| @@ -933,6 +929,7 @@ struct kvm_enable_cap { · 306 unmodified lines | ||
| 933 | 929 | #define KVM_CAP_PRE_FAULT_MEMORY 236 |
| 934 | 930 | #define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237 |
| 935 | 931 | #define KVM_CAP_X86_GUEST_MODE 238 |
| 932 | +#define KVM_CAP_ARM_WRITABLE_IMP_ID_REGS 239 | |
| 936 | 933 | |
| 937 | 934 | struct kvm_irq_routing_irqchip { |
| 938 | 935 | __u32 irqchip; |
| @@ -1070,6 +1067,10 @@ struct kvm_dirty_tlb { · 131 unmodified lines | ||
| 1070 | 1067 | |
| 1071 | 1068 | #define KVM_REG_SIZE_SHIFT 52 |
| 1072 | 1069 | #define KVM_REG_SIZE_MASK 0x00f0000000000000ULL |
| 1070 | + | |
| 1071 | +#define KVM_REG_SIZE(id) \ | |
| 1072 | + (1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT)) | |
| 1073 | + | |
| 1073 | 1074 | #define KVM_REG_SIZE_U8 0x0000000000000000ULL |
| 1074 | 1075 | #define KVM_REG_SIZE_U16 0x0010000000000000ULL |
| 1075 | 1076 | #define KVM_REG_SIZE_U32 0x0020000000000000ULL |