Changeset 90161 in vbox

Timestamp:

Jul 12, 2021 11:08:00 PM (4 years ago)

Author:

vboxsync

Message:

VMM: New status VERR_VMM_CONTEXT_HOOK_STILL_ENABLED for guru condition in VMMR0. bugref:10064 ticketref:20090

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp (modified) (1 diff)

trunk/include/VBox/err.h

@@ -1300 +1300 @@
 /** NEM returned in the wrong state. */
 #define VERR_VMM_WRONG_NEM_VMCPU_STATE      (-2718)
+/** Got back from vmmR0CallRing3SetJmp with the context hook still enabled. */
+#define VERR_VMM_CONTEXT_HOOK_STILL_ENABLED (-2719)
 /** @} */
 

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

@@ -1484 +1484 @@
                              */
                             if (RT_UNLIKELY(   VMCPU_GET_STATE(pGVCpu) != VMCPUSTATE_STARTED_HM
-                                            && RT_SUCCESS_NP(rc)  && rc !=  VINF_VMM_CALL_HOST ))
+                                            && RT_SUCCESS_NP(rc)
+                                            && rc != VINF_VMM_CALL_HOST ))
                             {
                                 pGVM->vmm.s.szRing0AssertMsg1[0] = '\0';
@@ -1497 +1498 @@
                                 RTStrPrintf(pGVM->vmm.s.szRing0AssertMsg2, sizeof(pGVM->vmm.s.szRing0AssertMsg2),
                                             "Thread-context hooks still enabled! VCPU=%p Id=%u rc=%d.\n", pGVCpu, pGVCpu->idCpu, rc);
-                                rc = VERR_INVALID_STATE;
+                                rc = VERR_VMM_CONTEXT_HOOK_STILL_ENABLED;
                             }
 

trunk/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp

@@ -321 +321 @@
         case VINF_EM_DBG_HYPER_ASSERTION:
         case VERR_VMM_RING3_CALL_DISABLED:
+        case VERR_VMM_WRONG_HM_VMCPU_STATE:
+        case VERR_VMM_CONTEXT_HOOK_STILL_ENABLED:
         {
             const char *pszMsg1 = VMMR3GetRZAssertMsg1(pVM);