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

Timestamp:

Dec 16, 2008 8:59:43 PM (16 years ago)

Author:

vboxsync

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

41119

Message:

Moved code around

File:

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

trunk/src/VBox/VMM/HWACCM.cpp

@@ -963 +963 @@
         }
     }
-
+    return VINF_SUCCESS;
+}
+
+/**
+ * Applies relocations to data and code managed by this
+ * component. This function will be called at init and
+ * whenever the VMM need to relocate it self inside the GC.
+ *
+ * @param   pVM     The VM.
+ */
+VMMR3DECL(void) HWACCMR3Relocate(PVM pVM)
+{
+    Log(("HWACCMR3Relocate to %RGv\n", MMHyperGetArea(pVM, 0)));
+
+    /* Fetch the current paging mode during the relocate callback during state loading. */
+    if (VMR3GetState(pVM) == VMSTATE_LOADING)
+    {
+        for (unsigned i=0;i<pVM->cCPUs;i++)
+        {
+            PVMCPU pVCpu = &pVM->aCpus[i];
+            /* @todo SMP */
+            pVCpu->hwaccm.s.enmShadowMode            = PGMGetShadowMode(pVM);
+            pVCpu->hwaccm.s.vmx.enmLastSeenGuestMode = PGMGetGuestMode(pVM);
+        }
+    }
 #if HC_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
     if (pVM->fHWACCMEnabled)
     {
+        int rc;
+
         switch(PGMGetHostMode(pVM))
         {
@@ -982 +1008 @@
             break;
         }
-
         rc = PDMR3LdrGetSymbolRC(pVM, NULL,       "VMXGCStartVM64", &pVM->hwaccm.s.pfnVMXGCStartVM64);
-        AssertMsgRCReturn(rc, ("VMXGCStartVM64 -> rc=%Rrc\n", rc), rc);
+        AssertReleaseMsgRC(rc, ("VMXGCStartVM64 -> rc=%Rrc\n", rc));
 
         rc = PDMR3LdrGetSymbolRC(pVM, NULL,       "SVMGCVMRun64",   &pVM->hwaccm.s.pfnSVMGCVMRun64);
-        AssertMsgRCReturn(rc, ("SVMGCVMRun64 -> rc=%Rrc\n", rc), rc);
+        AssertReleaseMsgRC(rc, ("SVMGCVMRun64 -> rc=%Rrc\n", rc));
 
         rc = PDMR3LdrGetSymbolRC(pVM, NULL,       "HWACCMSaveGuestFPU64",   &pVM->hwaccm.s.pfnSaveGuestFPU64);
-        AssertMsgRCReturn(rc, ("HWACCMSetupFPU64 -> rc=%Rrc\n", rc), rc);
+        AssertReleaseMsgRC(rc, ("HWACCMSetupFPU64 -> rc=%Rrc\n", rc));
 
         rc = PDMR3LdrGetSymbolRC(pVM, NULL,       "HWACCMSaveGuestDebug64",   &pVM->hwaccm.s.pfnSaveGuestDebug64);
-        AssertMsgRCReturn(rc, ("HWACCMSetupDebug64 -> rc=%Rrc\n", rc), rc);
+        AssertReleaseMsgRC(rc, ("HWACCMSetupDebug64 -> rc=%Rrc\n", rc));
 
 # ifdef DEBUG
         rc = PDMR3LdrGetSymbolRC(pVM, NULL,       "HWACCMTestSwitcher64",   &pVM->hwaccm.s.pfnTest64);
-        AssertMsgRCReturn(rc, ("HWACCMTestSwitcher64 -> rc=%Rrc\n", rc), rc);
+        AssertReleaseMsgRC(rc, ("HWACCMTestSwitcher64 -> rc=%Rrc\n", rc));
 # endif
     }
 #endif
-    return VINF_SUCCESS;
-}
-
-/**
- * Applies relocations to data and code managed by this
- * component. This function will be called at init and
- * whenever the VMM need to relocate it self inside the GC.
- *
- * @param   pVM     The VM.
- */
-VMMR3DECL(void) HWACCMR3Relocate(PVM pVM)
-{
-    Log(("HWACCMR3Relocate to %RGv\n", MMHyperGetArea(pVM, 0)));
-
-    /* Fetch the current paging mode during the relocate callback during state loading. */
-    if (VMR3GetState(pVM) == VMSTATE_LOADING)
-    {
-        for (unsigned i=0;i<pVM->cCPUs;i++)
-        {
-            PVMCPU pVCpu = &pVM->aCpus[i];
-            /* @todo SMP */
-            pVCpu->hwaccm.s.enmShadowMode            = PGMGetShadowMode(pVM);
-            pVCpu->hwaccm.s.vmx.enmLastSeenGuestMode = PGMGetGuestMode(pVM);
-        }
-    }
-
     return;
 }