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

tools headers UAPI: Sync x86's asm/kvm.h with the kernel sources 

To pick the changes in:

  8aff460f ("KVM: x86: Add a VALID_MASK for the flags in kvm_msr_filter_range")
  c1340fe3 ("KVM: x86: Add a VALID_MASK for the flag in kvm_msr_filter")
  be837942 ("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 <aaronlewis@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Link: http://lore.kernel.org/lkml/Y8VR5wSAkd2A0HxS@kernel.org


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

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

+5 −0
Original line number Diff line number Diff line
@@ -206,6 +206,8 @@ struct kvm_msr_list { 
struct kvm_msr_filter_range {

#define KVM_MSR_FILTER_READ  (1 << 0)

#define KVM_MSR_FILTER_WRITE (1 << 1)

#define KVM_MSR_FILTER_RANGE_VALID_MASK (KVM_MSR_FILTER_READ | \

					 KVM_MSR_FILTER_WRITE)

	__u32 flags;

	__u32 nmsrs; /* number of msrs in bitmap */

	__u32 base;  /* MSR index the bitmap starts at */
@@ -214,8 +216,11 @@ struct kvm_msr_filter_range { 


#define KVM_MSR_FILTER_MAX_RANGES 16

struct kvm_msr_filter {

#ifndef __KERNEL__

#define KVM_MSR_FILTER_DEFAULT_ALLOW (0 << 0)

#endif

#define KVM_MSR_FILTER_DEFAULT_DENY  (1 << 0)

#define KVM_MSR_FILTER_VALID_MASK (KVM_MSR_FILTER_DEFAULT_DENY)

	__u32 flags;

	struct kvm_msr_filter_range ranges[KVM_MSR_FILTER_MAX_RANGES];

};