diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-01-17 17:53:01 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-01-17 17:53:01 +0100 |
| commit | a9ff720e0fee2f64c279e71c1bf86e93804295d2 (patch) | |
| tree | c9d6a77274bcb90142aace2dd4a1c9808a191533 /arch/x86/kvm/x86.c | |
| parent | 21e7fbe7db2a983c046a05f12419d88c554a0f5a (diff) | |
| parent | 06b35d93af0a5904aa832f58733be84ddbfe2e04 (diff) | |
| download | linux-a9ff720e0fee2f64c279e71c1bf86e93804295d2.tar.gz | |
Merge branch 'x86/cpufeature' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
For AVX512_VPOPCNTDQ.
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index b02af6285887..6e2c71ea0627 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3345,6 +3345,8 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu, switch (cap->cap) { case KVM_CAP_HYPERV_SYNIC: + if (!irqchip_in_kernel(vcpu->kvm)) + return -EINVAL; return kvm_hv_activate_synic(vcpu); default: return -EINVAL; @@ -6074,6 +6076,7 @@ out: void kvm_arch_exit(void) { + kvm_lapic_exit(); perf_unregister_guest_info_callbacks(&kvm_guest_cbs); if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) |