Skip to content

Commit b7b9825

Browse files
committed
tools headers UAPI: Sync linux/kvm.h with the kernel sources
To pick the changes in: f6c6804 ("kvm: Move KVM_GET_XSAVE2 IOCTL definition at the end of kvm.h") That just rebuilds perf, as these patches don't add any new KVM ioctl to be harvested for the the 'perf trace' ioctl syscall argument beautifiers. This is also by now used by tools/testing/selftests/kvm/, a simple test build succeeded. This silences this 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: Janosch Frank <[email protected]> Cc: Paolo Bonzini <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 9334030 commit b7b9825

File tree

1 file changed

+3
-3
lines changed
  • tools/include/uapi/linux

1 file changed

+3
-3
lines changed

tools/include/uapi/linux/kvm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,9 +1624,6 @@ struct kvm_enc_region {
16241624
#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
16251625
#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
16261626

1627-
/* Available with KVM_CAP_XSAVE2 */
1628-
#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
1629-
16301627
struct kvm_s390_pv_sec_parm {
16311628
__u64 origin;
16321629
__u64 length;
@@ -2048,4 +2045,7 @@ struct kvm_stats_desc {
20482045

20492046
#define KVM_GET_STATS_FD _IO(KVMIO, 0xce)
20502047

2048+
/* Available with KVM_CAP_XSAVE2 */
2049+
#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
2050+
20512051
#endif /* __LINUX_KVM_H */

0 commit comments

Comments
 (0)