Skip to contentSkip to conversation

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

tip: perf/urgent tip-bot2 for Arnaldo Carvalho de Melo 1 participant 1 message Dec 17, 2019 1 message not in the archive

lore
Share & tools
lore

tip-bot2 for Arnaldo Carvalho de Melo

author merge bot Applied
#1 lore raw
In reply to a message not in the archive

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     b444268801a29b10c9edea037efcf4c7c4db9283
Gitweb:        https://git.kernel.org/tip/b444268801a29b10c9edea037efcf4c7c4db9283
Author:        Arnaldo Carvalho de Melo <[email protected]>
AuthorDate:    Wed, 11 Dec 2019 10:06:45 -03:00
Committer:     Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Wed, 11 Dec 2019 10:08:35 -03:00

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

To pick up the changes from:

22945688acd4 ("KVM: PPC: Book3S HV: Support reset of secure guest")

No tools changes are caused by this, as the only defines so far used from these files are for syscall arg pretty printing are:

  $ grep KVM tools/perf/trace/beauty/*.sh
  tools/perf/trace/beauty/kvm_ioctl.sh:regex='^#[[:space:]]*define[[:space:]]+KVM_(\w+)[[:space:]]+_IO[RW]*\([[:space:]]*KVMIO[[:space:]]*,[[:space:]]*(0x[[:xdigit:]]+).*'
  $

This addresses these tools/perf build warnings:

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

---
 tools/include/uapi/linux/kvm.h | 1 +
 1 file changed, 1 insertion(+)
tools/include/uapi/linux/kvm.h +1 -0
index e6f17c8..f0a16b4 100644
@@ -1348,6 +1348,7 @@ struct kvm_s390_ucas_mapping {
 #define KVM_PPC_GET_CPU_CHAR	  _IOR(KVMIO,  0xb1, struct kvm_ppc_cpu_char)
 /* Available with KVM_CAP_PMU_EVENT_FILTER */
 #define KVM_SET_PMU_EVENT_FILTER  _IOW(KVMIO,  0xb2, struct kvm_pmu_event_filter)
+#define KVM_PPC_SVM_OFF		  _IO(KVMIO,  0xb3)
 
 /* ioctl for vm fd */
 #define KVM_CREATE_DEVICE	  _IOWR(KVMIO,  0xe0, struct kvm_create_device)