|
@@ -10214,15 +10214,16 @@ static void vmx_set_virtual_apic_mode(struct kvm_vcpu *vcpu)
|
|
|
if (!lapic_in_kernel(vcpu))
|
|
|
return;
|
|
|
|
|
|
+ if (!flexpriority_enabled &&
|
|
|
+ !cpu_has_vmx_virtualize_x2apic_mode())
|
|
|
+ return;
|
|
|
+
|
|
|
/* Postpone execution until vmcs01 is the current VMCS. */
|
|
|
if (is_guest_mode(vcpu)) {
|
|
|
to_vmx(vcpu)->nested.change_vmcs01_virtual_apic_mode = true;
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if (!cpu_need_tpr_shadow(vcpu))
|
|
|
- return;
|
|
|
-
|
|
|
sec_exec_control = vmcs_read32(SECONDARY_VM_EXEC_CONTROL);
|
|
|
sec_exec_control &= ~(SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |
|
|
|
SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE);
|