Changeset 72802 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 2, 2018 4:49:04 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123345

Message:

VMM/HMVMXR0: bugref:9193 Don't trash error codes for events unconditionally when Unrestricted-guest execution is used.
It's only for real-mode + UX we need to clear the error code in the VMCS. Should address the
VERR_VMX_UNABLE_TO_START_VM gurus.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -41 +41 @@
 #include "HMVMXR0.h"
 #include "dtrace/VBoxVMM.h"
-
-#define HMVMX_ALWAYS_SYNC_FULL_GUEST_STATE
 
 #ifdef DEBUG_ramshankar
@@ -7632 +7630 @@
     STAM_COUNTER_INC(&pVCpu->hm.s.paStatInjectedIrqsR0[uVector & MASK_INJECT_IRQ_STAT]);
 
-    if (pVCpu->CTX_SUFF(pVM)->hm.s.vmx.fUnrestrictedGuest)
-    {
-        /*
-         * For unrestricted execution enabled CPUs running real-mode guests, we must not set the deliver-error-code bit.
-         * See Intel spec. 26.2.1.3 "VM-Entry Control Fields".
-         */
-        u32IntInfo &= ~VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_VALID;
-    }
-    else
-    {
-        /* We require CR0 to check if the guest is in real-mode. */
-        int rc = hmR0VmxImportGuestState(pVCpu, CPUMCTX_EXTRN_CR0);
-        AssertRCReturn(rc, rc);
-
-        /*
-         * Hardware interrupts & exceptions cannot be delivered through the software interrupt
-         * redirection bitmap to the real mode task in virtual-8086 mode. We must jump to the
-         * interrupt handler in the (real-mode) guest.
-         *
-         * See Intel spec. 20.3 "Interrupt and Exception handling in Virtual-8086 Mode".
-         * See Intel spec. 20.1.4 "Interrupt and Exception Handling" for real-mode interrupt handling.
-         */
-        if (CPUMIsGuestInRealModeEx(pMixedCtx))
+    /* We require CR0 to check if the guest is in real-mode. */
+    /** @todo No we don't, since CR0.PE is always intercepted. */
+    int rc = hmR0VmxImportGuestState(pVCpu, CPUMCTX_EXTRN_CR0);
+    AssertRCReturn(rc, rc);
+
+    /*
+     * Hardware interrupts & exceptions cannot be delivered through the software interrupt
+     * redirection bitmap to the real mode task in virtual-8086 mode. We must jump to the
+     * interrupt handler in the (real-mode) guest.
+     *
+     * See Intel spec. 20.3 "Interrupt and Exception handling in Virtual-8086 Mode".
+     * See Intel spec. 20.1.4 "Interrupt and Exception Handling" for real-mode interrupt handling.
+     */
+    if (CPUMIsGuestInRealModeEx(pMixedCtx))
+    {
+        if (pVCpu->CTX_SUFF(pVM)->hm.s.vmx.fUnrestrictedGuest)
+        {
+            /*
+             * For unrestricted execution enabled CPUs running real-mode guests, we must not                              .
+             * set the deliver-error-code bit                                                                             .
+             *                                                                                                            .
+             * See Intel spec. 26.2.1.3 "VM-Entry Control Fields".
+             */
+            u32IntInfo &= ~VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_VALID;
+        }
+        else
         {
             PVM pVM = pVCpu->CTX_SUFF(pVM);
@@ -7762 +7763 @@
 
     /* Inject. */
-    int rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_ENTRY_INTERRUPTION_INFO, u32IntInfo);
+    rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_ENTRY_INTERRUPTION_INFO, u32IntInfo);
     if (VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_IS_VALID(u32IntInfo))
         rc |= VMXWriteVmcs32(VMX_VMCS32_CTRL_ENTRY_EXCEPTION_ERRCODE, u32ErrCode);