Skip to content

Commit 8d761d2

Browse files
committed
tools headers UAPI: Sync kvm.h headers with the kernel sources
To pick the changes in: 15e9e35 ("KVM: MIPS: Change the definition of kvm type") 004a012 ("arm64/x86: KVM: Introduce steal-time cap") That do not result in any change in tooling, as the additions are not being used in any table generator. This silences these perf build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/kvm.h' differs from latest version at 'include/uapi/linux/kvm.h' diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Andrew Jones <drjones@redhat.com> Cc: Huacai Chen <chenhc@lemote.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Marc Zyngier <maz@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent ae5dcc8 commit 8d761d2

File tree

1 file changed

+4
-2
lines changed
  • tools/include/uapi/linux

1 file changed

+4
-2
lines changed

tools/include/uapi/linux/kvm.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -790,9 +790,10 @@ struct kvm_ppc_resize_hpt {
790790
#define KVM_VM_PPC_HV 1
791791
#define KVM_VM_PPC_PR 2
792792

793-
/* on MIPS, 0 forces trap & emulate, 1 forces VZ ASE */
794-
#define KVM_VM_MIPS_TE 0
793+
/* on MIPS, 0 indicates auto, 1 forces VZ ASE, 2 forces trap & emulate */
794+
#define KVM_VM_MIPS_AUTO 0
795795
#define KVM_VM_MIPS_VZ 1
796+
#define KVM_VM_MIPS_TE 2
796797

797798
#define KVM_S390_SIE_PAGE_OFFSET 1
798799

@@ -1035,6 +1036,7 @@ struct kvm_ppc_resize_hpt {
10351036
#define KVM_CAP_LAST_CPU 184
10361037
#define KVM_CAP_SMALLER_MAXPHYADDR 185
10371038
#define KVM_CAP_S390_DIAG318 186
1039+
#define KVM_CAP_STEAL_TIME 187
10381040

10391041
#ifdef KVM_CAP_IRQ_ROUTING
10401042

0 commit comments

Comments
 (0)