Skip to content

Commit 3c71ae8

Browse files
committed
tools headers UAPI: Sync linux/kvm.h with the kernel sources
To pick the changes in: da142f3 ("KVM: Remove subtle "struct kvm_stats_desc" pseudo-overlay") That just rebuilds perf, as these patches don't add any new KVM ioctl to be harvested for the 'perf trace' ioctl syscall argument beautifiers. This addresses this perf build warning: Warning: Kernel ABI header differences: diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h Please see tools/include/uapi/README for further details. Cc: Sean Christopherson <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 4ddd758 commit 3c71ae8

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

  • tools/include/uapi/linux

tools/include/uapi/linux/kvm.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
#include <linux/ioctl.h>
1515
#include <asm/kvm.h>
1616

17+
#ifdef __KERNEL__
18+
#include <linux/kvm_types.h>
19+
#endif
20+
1721
#define KVM_API_VERSION 12
1822

1923
/*
@@ -1601,7 +1605,11 @@ struct kvm_stats_desc {
16011605
__u16 size;
16021606
__u32 offset;
16031607
__u32 bucket_size;
1608+
#ifdef __KERNEL__
1609+
char name[KVM_STATS_NAME_SIZE];
1610+
#else
16041611
char name[];
1612+
#endif
16051613
};
16061614

16071615
#define KVM_GET_STATS_FD _IO(KVMIO, 0xce)

0 commit comments

Comments
 (0)