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

Timestamp:

Feb 14, 2022 12:52:27 PM (3 years ago)

Author:

vboxsync

Message:

VMM/HM: Register DBGF info handlers only when HM is enabled, bugref:9044

File:

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

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

@@ -230 +230 @@
     if (RT_FAILURE(rc))
         return rc;
-
-    /*
-     * 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);
 
     /*
@@ -525 +508 @@
     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);