Commit 77f81f37 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-basic-exit-reason' into HEAD 



Using a topic branch so that stable branches can simply cherry-pick the
patch.

Reviewed-by: default avatarOliver Upton <oupton@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parents 80fbd280 2ebac8bb

arch/x86/kvm/vmx/nested.c

+2 −2
Original line number Diff line number Diff line
@@ -5672,7 +5672,7 @@ static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu, u32 exit_reason) 
{

	u32 intr_info;



	switch (exit_reason) {

	switch ((u16)exit_reason) {

	case EXIT_REASON_EXCEPTION_NMI:

		intr_info = vmx_get_intr_info(vcpu);

		if (is_nmi(intr_info))
@@ -5733,7 +5733,7 @@ static bool nested_vmx_l1_wants_exit(struct kvm_vcpu *vcpu, u32 exit_reason) 
	struct vmcs12 *vmcs12 = get_vmcs12(vcpu);

	u32 intr_info;



	switch (exit_reason) {

	switch ((u16)exit_reason) {

	case EXIT_REASON_EXCEPTION_NMI:

		intr_info = vmx_get_intr_info(vcpu);

		if (is_nmi(intr_info))

CRA Git | Maintained and supported by SUSTech CRA and CCSE