aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Christopherson <sean.j.christopherson@intel.com>2020-03-12 16:27:41 -0700
committerPaolo Bonzini <pbonzini@redhat.com>2020-03-14 11:33:22 +0100
commit782985f1b69b3ff06d228b3bb115242a7203b38f (patch)
treed9a9ca47827226743245d9084356c5cfb61556b1
parent11a6e3d5913442e6797cf15e547bdc6038d7d189 (diff)
downloadkvm-unit-tests-782985f1b69b3ff06d228b3bb115242a7203b38f.tar.gz
nVMX: Drop redundant check for guest termination
Remove the check_for_guest_termination() call in enter_guest_with_bad_controls() as __enter_guest() unconditionally performs the check if VM-Enter is successful (and aborts on failed VM-Entry for the ...bad_controls() variant). Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--x86/vmx.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/x86/vmx.c b/x86/vmx.c
index da17807..d92350d 100644
--- a/x86/vmx.c
+++ b/x86/vmx.c
@@ -1895,16 +1895,6 @@ void enter_guest_with_bad_controls(void)
report(vmcs_read(VMX_INST_ERROR) == VMXERR_ENTRY_INVALID_CONTROL_FIELD,
"VM-Inst Error # is %d (VM entry with invalid control field(s))",
VMXERR_ENTRY_INVALID_CONTROL_FIELD);
-
- /*
- * This if statement shouldn't fire, as the entire premise of this
- * function is that VM entry is expected to fail, rather than succeed
- * and execute to termination. However, if the VM entry does
- * unexpectedly succeed, it's nice to check whether the guest has
- * terminated, to reduce the number of error messages.
- */
- if (!result.vm_fail)
- check_for_guest_termination();
}
void enter_guest(void)