Commit 2a8d017d authored Feb 12, 2020 by Arnaldo Carvalho de Melo

tools headers kvm: Sync linux/kvm.h with the kernel sources



To pick up the changes from:

  7de3f142 ("KVM: s390: Add new reset vcpu API")

So far we're ignoring those arch specific ioctls, we need to revisit
this at some time to have arch specific tables, etc:

  $ grep S390 tools/perf/trace/beauty/kvm_ioctl.sh
  	egrep -v " ((ARM|PPC|S390)_|[GS]ET_(DEBUGREGS|PIT2|XSAVE|TSC_KHZ)|CREATE_SPAPR_TCE_64)" | \
  $

This addresses these tools/perf build warnings:

  Warning: Kernel ABI header at 'tools/arch/arm/include/uapi/asm/kvm.h' differs from latest version at 'arch/arm/include/uapi/asm/kvm.h'
  diff -u tools/arch/arm/include/uapi/asm/kvm.h arch/arm/include/uapi/asm/kvm.h

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Janosch Frank <frankja@linux.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 391df72f

tools/include/uapi/linux/kvm.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -1009,6 +1009,7 @@ struct kvm_ppc_resize_hpt {
		#define KVM_CAP_PPC_GUEST_DEBUG_SSTEP 176
		#define KVM_CAP_ARM_NISV_TO_USER 177
		#define KVM_CAP_ARM_INJECT_EXT_DABT 178
		#define KVM_CAP_S390_VCPU_RESETS 179

		#ifdef KVM_CAP_IRQ_ROUTING

		@@ -1473,6 +1474,10 @@ struct kvm_enc_region {
		/* Available with KVM_CAP_ARM_SVE */
		#define KVM_ARM_VCPU_FINALIZE _IOW(KVMIO, 0xc2, int)

		/* Available with KVM_CAP_S390_VCPU_RESETS */
		#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
		#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)

		/* Secure Encrypted Virtualization command */
		enum sev_cmd_id {
		/* Guest initialization commands */

Admin message