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

Timestamp:

Feb 14, 2022 2:33:32 PM (3 years ago)

Author:

vboxsync

Message:

VMM/HM: Need to postpone registering the debug info handlers further, bugref:9044

File:

• trunk/src/VBox/VMM/VMMR3/HM.cpp (modified) (2 diffs)

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

@@ -510 +510 @@
     if (pVM->fHMEnabled)
     {
-        /*
-         * Register info handlers.
-         */
-        rc = DBGFR3InfoRegisterInternalEx(pVM, "hm", "Dumps HM info.", hmR3Info, DBGFINFO_FLAGS_ALL_EMTS);
-        AssertRCReturn(rc, rc);
-
-        rc = DBGFR3InfoRegisterInternalEx(pVM, "hmeventpending", "Dumps the pending HM event.", hmR3InfoEventPending,
-                                          DBGFINFO_FLAGS_ALL_EMTS);
-        AssertRCReturn(rc, rc);
-
-        rc = DBGFR3InfoRegisterInternalEx(pVM, "svmvmcbcache", "Dumps the HM SVM nested-guest VMCB cache.",
-                                          hmR3InfoSvmNstGstVmcbCache, DBGFINFO_FLAGS_ALL_EMTS);
-        AssertRCReturn(rc, rc);
-
-        rc = DBGFR3InfoRegisterInternalEx(pVM, "lbr", "Dumps the HM LBR info.", hmR3InfoLbr, DBGFINFO_FLAGS_ALL_EMTS);
-        AssertRCReturn(rc, rc);
-
-
         uint32_t fCaps;
         rc = SUPR3QueryVTCaps(&fCaps);
@@ -654 +636 @@
             || pVM->bMainExecutionEngine == VM_EXEC_ENGINE_HW_VIRT /* paranoia */)
             return VM_SET_ERROR(pVM, rc, "Misconfigured VM: No guest execution engine available!");
+    }
+
+    if (pVM->fHMEnabled)
+    {
+        /*
+         * Register info handlers now that HM is used for sure.
+         */
+        rc = DBGFR3InfoRegisterInternalEx(pVM, "hm", "Dumps HM info.", hmR3Info, DBGFINFO_FLAGS_ALL_EMTS);
+        AssertRCReturn(rc, rc);
+
+        rc = DBGFR3InfoRegisterInternalEx(pVM, "hmeventpending", "Dumps the pending HM event.", hmR3InfoEventPending,
+                                          DBGFINFO_FLAGS_ALL_EMTS);
+        AssertRCReturn(rc, rc);
+
+        rc = DBGFR3InfoRegisterInternalEx(pVM, "svmvmcbcache", "Dumps the HM SVM nested-guest VMCB cache.",
+                                          hmR3InfoSvmNstGstVmcbCache, DBGFINFO_FLAGS_ALL_EMTS);
+        AssertRCReturn(rc, rc);
+
+        rc = DBGFR3InfoRegisterInternalEx(pVM, "lbr", "Dumps the HM LBR info.", hmR3InfoLbr, DBGFINFO_FLAGS_ALL_EMTS);
+        AssertRCReturn(rc, rc);
     }