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

Timestamp:

May 30, 2019 11:32:08 AM (6 years ago)

Author:

vboxsync

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

130986

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Host-NMI VM-exit helper.

File:

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

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

@@ -478 +478 @@
 static VBOXSTRICTRC hmR0VmxExitMovFromCrX(PVMCPU pVCpu, PCVMXVMCSINFO pVmcsInfo, uint8_t cbInstr, uint8_t iGReg, uint8_t iCrReg);
 static VBOXSTRICTRC hmR0VmxExitMovToCrX(PVMCPU pVCpu, PCVMXVMCSINFO pVmcsInfo, uint8_t cbInstr, uint8_t iGReg, uint8_t iCrReg);
+static VBOXSTRICTRC hmR0VmxExitHostNmi(PVMCPU pVCpu);
 /** @} */
 
@@ -12009 +12010 @@
         int rc2 = hmR0VmxReadExitIntInfoVmcs(pVmxTransient);
         AssertRCReturn(rc2, rc2);
-        uint32_t uIntType = VMX_EXIT_INT_INFO_TYPE(pVmxTransient->uExitIntInfo);
+        uint32_t const uIntType = VMX_EXIT_INT_INFO_TYPE(pVmxTransient->uExitIntInfo);
         if (uIntType == VMX_EXIT_INT_INFO_TYPE_NMI)
-            return hmR0VmxExitXcptOrNmi(pVCpu, pVmxTransient);
+            return hmR0VmxExitHostNmi(pVCpu);
     }
 
@@ -13077 +13078 @@
          * [2] -- See Intel spec. 27.5.5 "Updating Non-Register State".
          */
-        VMXDispatchHostNmi();
-        STAM_REL_COUNTER_INC(&pVCpu->hm.s.StatExitHostNmiInGC);
-        STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExitXcptNmi, y3);
-        return VINF_SUCCESS;
+        return hmR0VmxExitHostNmi(pVCpu);
     }
 
@@ -15419 +15417 @@
 
 
+/**
+ * VM-exit helper for handling host NMIs.
+ */
+static VBOXSTRICTRC hmR0VmxExitHostNmi(PVMCPU pVCpu)
+{
+    VMXDispatchHostNmi();
+
+    STAM_REL_COUNTER_INC(&pVCpu->hm.s.StatExitHostNmiInGC);
+    STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExitXcptNmi, y3);
+    return VINF_SUCCESS;
+}
+
+
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
 /** @name VMX instruction handlers.