Changeset 91295 in vbox

Timestamp:

Sep 17, 2021 11:05:41 AM (3 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Some nested SVM init/term cleanups. bugref:10093

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (4 diffs)

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

@@ -1011 +1011 @@
 
 /**
- * Frees memory allocated for the SVM hardware virtualization state.
+ * Initialize SVM hardware virtualization state (used to allocate it).
  *
  * @param   pVM     The cross context VM structure.
  */
-static void cpumR3FreeSvmHwVirtState(PVM pVM)
+static void cpumR3InitSvmHwVirtState(PVM pVM)
 {
     Assert(pVM->cpum.s.GuestFeatures.fSvm);
-    RT_NOREF(pVM);
-}
-
-
-/**
- * Allocates memory for the SVM hardware virtualization state.
- *
- * @returns VBox status code.
- * @param   pVM     The cross context VM structure.
- */
-static int cpumR3AllocSvmHwVirtState(PVM pVM)
-{
-    Assert(pVM->cpum.s.GuestFeatures.fSvm);
-
-    int rc = VINF_SUCCESS;
+
     LogRel(("CPUM: Allocating %u pages for the nested-guest SVM MSR and IO permission bitmaps\n",
             pVM->cCpus * (SVM_MSRPM_PAGES + SVM_IOPM_PAGES)));
@@ -1044 +1030 @@
         AssertCompile(SVM_IOPM_PAGES  * X86_PAGE_SIZE == sizeof(pVCpu->cpum.s.Guest.hwvirt.svm.abIoBitmap));
     }
-
-    /* On any failure, cleanup. */
-    if (RT_FAILURE(rc))
-        cpumR3FreeSvmHwVirtState(pVM);
-
-    return rc;
 }
 
@@ -2267 +2247 @@
         rc = cpumR3AllocVmxHwVirtState(pVM);
     else if (pVM->cpum.s.GuestFeatures.fSvm)
-        rc = cpumR3AllocSvmHwVirtState(pVM);
+        cpumR3InitSvmHwVirtState(pVM);
     else
         Assert(pVM->apCpusR3[0]->cpum.s.Guest.hwvirt.enmHwvirt == CPUMHWVIRT_NONE);
@@ -2328 +2308 @@
         cpumR3FreeVmxHwVirtState(pVM);
     }
-    else if (pVM->cpum.s.GuestFeatures.fSvm)
-        cpumR3FreeSvmHwVirtState(pVM);
     return VINF_SUCCESS;
 }