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

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=d0e9f4c1a4e777c4d1122758137fc47238f4f015
Commit:     d0e9f4c1a4e777c4d1122758137fc47238f4f015
Parent:     605e71cd007b1897a4c5eda952acadd61b6a98f0
Author:     Arnaldo Carvalho de Melo <acme at redhat.com>
AuthorDate: Mon May 7 12:26:23 2018 -0300
Committer:  Arnaldo Carvalho de Melo <acme at redhat.com>
CommitDate: Mon May 7 15:23:45 2018 -0300

    tools headers kvm: Sync uapi/linux/kvm.h with the kernel sources
    
    The changes in 5e62493f1a70 ("x86/headers/UAPI: Move DISABLE_EXITS KVM
    capability bits to the UAPI") do not requires changes in the tooling nor
    will trigger the automatic update of used ioctl string tables, copy it
    to silence this build warning:
    
      Warning: Kernel ABI header at 'tools/include/uapi/linux/kvm.h' differs from latest version at 'include/uapi/linux/kvm.h'
    
    Cc: Adrian Hunter <adrian.hunter at intel.com>
    Cc: David Ahern <dsahern at gmail.com>
    Cc: Jiri Olsa <jolsa at kernel.org>
    Cc: KarimAllah Ahmed <karahmed at amazon.de>
    Cc: Namhyung Kim <namhyung at kernel.org>
    Cc: Radim Krčmář <rkrcmar at redhat.com>
    Cc: Wang Nan <wangnan0 at huawei.com>
    Link: https://lkml.kernel.org/n/tip-8o5auh1lqglsgl1q97x00tlv@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
---
 tools/include/uapi/linux/kvm.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h
index 1065006c9bf5..b02c41e53d56 100644
--- a/tools/include/uapi/linux/kvm.h
+++ b/tools/include/uapi/linux/kvm.h
@@ -676,6 +676,13 @@ struct kvm_ioeventfd {
 	__u8  pad[36];
 };
 
+#define KVM_X86_DISABLE_EXITS_MWAIT          (1 << 0)
+#define KVM_X86_DISABLE_EXITS_HTL            (1 << 1)
+#define KVM_X86_DISABLE_EXITS_PAUSE          (1 << 2)
+#define KVM_X86_DISABLE_VALID_EXITS          (KVM_X86_DISABLE_EXITS_MWAIT | \
+                                              KVM_X86_DISABLE_EXITS_HTL | \
+                                              KVM_X86_DISABLE_EXITS_PAUSE)
+
 /* for KVM_ENABLE_CAP */
 struct kvm_enable_cap {
 	/* in */