Skip to content

Commit effa768

Browse files
committed
tools headers UAPI: Sync x86's asm/kvm.h with the kernel sources
To pick the changes in: 8aff460 ("KVM: x86: Add a VALID_MASK for the flags in kvm_msr_filter_range") c1340fe ("KVM: x86: Add a VALID_MASK for the flag in kvm_msr_filter") be83794 ("KVM: x86: Disallow the use of KVM_MSR_FILTER_DEFAULT_ALLOW in the kernel") That just rebuilds kvm-stat.c on x86, no change in functionality. This silences these perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/kvm.h' differs from latest version at 'arch/x86/include/uapi/asm/kvm.h' diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h Cc: Aaron Lewis <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paolo Bonzini <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 8026a31 commit effa768

File tree

1 file changed

+5
-0
lines changed
  • tools/arch/x86/include/uapi/asm

1 file changed

+5
-0
lines changed

tools/arch/x86/include/uapi/asm/kvm.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ struct kvm_msr_list {
206206
struct kvm_msr_filter_range {
207207
#define KVM_MSR_FILTER_READ (1 << 0)
208208
#define KVM_MSR_FILTER_WRITE (1 << 1)
209+
#define KVM_MSR_FILTER_RANGE_VALID_MASK (KVM_MSR_FILTER_READ | \
210+
KVM_MSR_FILTER_WRITE)
209211
__u32 flags;
210212
__u32 nmsrs; /* number of msrs in bitmap */
211213
__u32 base; /* MSR index the bitmap starts at */
@@ -214,8 +216,11 @@ struct kvm_msr_filter_range {
214216

215217
#define KVM_MSR_FILTER_MAX_RANGES 16
216218
struct kvm_msr_filter {
219+
#ifndef __KERNEL__
217220
#define KVM_MSR_FILTER_DEFAULT_ALLOW (0 << 0)
221+
#endif
218222
#define KVM_MSR_FILTER_DEFAULT_DENY (1 << 0)
223+
#define KVM_MSR_FILTER_VALID_MASK (KVM_MSR_FILTER_DEFAULT_DENY)
219224
__u32 flags;
220225
struct kvm_msr_filter_range ranges[KVM_MSR_FILTER_MAX_RANGES];
221226
};

0 commit comments

Comments
 (0)