Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91fa0f8e authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: always use "acknowledge interrupt on exit" 



This is necessary to simplify handle_external_intr in the next patch.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6edaa530

arch/x86/kvm/vmx.c

+3 −4
Original line number Diff line number Diff line
@@ -3390,12 +3390,12 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf) 
		      vmx_capability.ept, vmx_capability.vpid);

	}



	min = VM_EXIT_SAVE_DEBUG_CONTROLS;

	min = VM_EXIT_SAVE_DEBUG_CONTROLS | VM_EXIT_ACK_INTR_ON_EXIT;

#ifdef CONFIG_X86_64

	min |= VM_EXIT_HOST_ADDR_SPACE_SIZE;

#endif

	opt = VM_EXIT_SAVE_IA32_PAT | VM_EXIT_LOAD_IA32_PAT |

		VM_EXIT_ACK_INTR_ON_EXIT | VM_EXIT_CLEAR_BNDCFGS;

		VM_EXIT_CLEAR_BNDCFGS;

	if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_EXIT_CTLS,

				&_vmexit_control) < 0)

		return -EIO;
@@ -3408,8 +3408,7 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf) 
		return -EIO;



	if (!(_cpu_based_2nd_exec_control &

		SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY) ||

		!(_vmexit_control & VM_EXIT_ACK_INTR_ON_EXIT))

		SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY))

		_pin_based_exec_control &= ~PIN_BASED_POSTED_INTR;



	min = VM_ENTRY_LOAD_DEBUG_CONTROLS;