Home Home > GIT Browse > SLE12-SP3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2019-02-21 14:55:42 +0100
committerJoerg Roedel <jroedel@suse.de>2019-02-21 14:59:02 +0100
commite623f5d0a17a839affd96ed9ca9e4466e9689f17 (patch)
treeb00c9619851bf7f8974860e3ce57c46504b30110
parentc1f8455681d236aa8e30b96868cc571801facc24 (diff)
KVM: VMX: Missing part of upstream commit 904e14fb7cb9 (bsc#1124166).
-rw-r--r--arch/x86/kvm/vmx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 6ce76429ce0c..8ef2040e51e0 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -4804,7 +4804,7 @@ static u8 vmx_msr_bitmap_mode(struct kvm_vcpu *vcpu)
(vmcs_read32(SECONDARY_VM_EXEC_CONTROL) &
SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE)) {
mode |= MSR_BITMAP_MODE_X2APIC;
- if (enable_apicv)
+ if (enable_apicv && kvm_vcpu_apicv_active(vcpu))
mode |= MSR_BITMAP_MODE_X2APIC_APICV;
}