Skip to content

Commit

Permalink
tools arch kvm: Sync kvm headers with the kernel sources
Browse files Browse the repository at this point in the history
To pick up the changes from:

  83d31e5 ("KVM: nVMX: fixes for preemption timer migration")

That don't entail changes in tooling.

This silences these tools/perf build warnings:

  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: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Jul 17, 2020
1 parent 94fddb7 commit 25d4e7f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions tools/arch/x86/include/uapi/asm/kvm.h
Original file line number Diff line number Diff line change
Expand Up @@ -408,14 +408,15 @@ struct kvm_vmx_nested_state_data {
};

struct kvm_vmx_nested_state_hdr {
__u32 flags;
__u64 vmxon_pa;
__u64 vmcs12_pa;
__u64 preemption_timer_deadline;

struct {
__u16 flags;
} smm;

__u32 flags;
__u64 preemption_timer_deadline;
};

struct kvm_svm_nested_state_data {
Expand Down

0 comments on commit 25d4e7f

Please sign in to comment.