summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/cpuid.c
diff options
context:
space:
mode:
authorPaolo Bonzini2016-07-12 10:36:41 +0200
committerPaolo Bonzini2017-12-14 09:26:38 +0100
commitae3e61e1c28338d077b704505570fa181df1e41f (patch)
treeaeaec47358621770a61dd23a4f8d08bd7ca81fc7 /arch/x86/kvm/cpuid.c
parenttools/kvm_stat: add line for totals (diff)
downloadkernel-qcow2-linux-ae3e61e1c28338d077b704505570fa181df1e41f.tar.gz
kernel-qcow2-linux-ae3e61e1c28338d077b704505570fa181df1e41f.tar.xz
kernel-qcow2-linux-ae3e61e1c28338d077b704505570fa181df1e41f.zip
KVM: x86: add support for UMIP
Add the CPUID bits, make the CR4.UMIP bit not reserved anymore, and add UMIP support for instructions that are already emulated by KVM. Reviewed-by: Wanpeng Li <wanpeng.li@hotmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/cpuid.c')
-rw-r--r--arch/x86/kvm/cpuid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 0099e10eb045..77fb8732b47b 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -387,8 +387,8 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
/* cpuid 7.0.ecx*/
const u32 kvm_cpuid_7_0_ecx_x86_features =
- F(AVX512VBMI) | F(LA57) | F(PKU) |
- 0 /*OSPKE*/ | F(AVX512_VPOPCNTDQ);
+ F(AVX512VBMI) | F(LA57) | F(PKU) | 0 /*OSPKE*/ |
+ F(AVX512_VPOPCNTDQ) | F(UMIP);
/* cpuid 7.0.edx*/
const u32 kvm_cpuid_7_0_edx_x86_features =