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

Timestamp:

Jan 25, 2013 12:29:24 PM (12 years ago)

Author:

vboxsync

Message:

FTM: pVM -> pUVM for main, mark as many as possible interfaces module internal.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/FTMAll.cpp (modified) (2 diffs)
• VMMR3/FTM.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/VMMAll/FTMAll.cpp

@@ -39 +39 @@
  * @param   enmType     Checkpoint type
  */
-VMMDECL(int)   FTMSetCheckpoint(PVM pVM, FTMCHECKPOINTTYPE enmType)
+VMM_INT_DECL(int) FTMSetCheckpoint(PVM pVM, FTMCHECKPOINTTYPE enmType)
 {
     if (!pVM->fFaultTolerantMaster)
@@ -59 +59 @@
  * @param   pVM         Pointer to the VM.
  */
-VMMDECL(bool)  FTMIsDeltaLoadSaveActive(PVM pVM)
+VMM_INT_DECL(bool) FTMIsDeltaLoadSaveActive(PVM pVM)
 {
     return pVM->ftm.s.fDeltaLoadSaveActive;

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

@@ -29 +29 @@
 #include "FTMInternal.h"
 #include <VBox/vmm/vm.h>
+#include <VBox/vmm/uvm.h>
 #include <VBox/err.h>
 #include <VBox/param.h>
@@ -102 +103 @@
  * @param   pVM         Pointer to the VM.
  */
-VMMR3DECL(int) FTMR3Init(PVM pVM)
+VMMR3_INT_DECL(int) FTMR3Init(PVM pVM)
 {
     /*
@@ -158 +159 @@
  * @param   pVM         Pointer to the VM.
  */
-VMMR3DECL(int) FTMR3Term(PVM pVM)
+VMMR3_INT_DECL(int) FTMR3Term(PVM pVM)
 {
     if (pVM->ftm.s.hShutdownEvent != NIL_RTSEMEVENT)
@@ -1125 +1126 @@
  * @returns VBox status code.
  *
- * @param   pVM         Pointer to the VM.
+ * @param   pUVM        The user mode VM handle.
  * @param   fMaster     FT master or standby
  * @param   uInterval   FT sync interval
@@ -1136 +1137 @@
  * @vmstateto   PoweringOn+Running (master), PoweringOn+Running_FT (standby)
  */
-VMMR3DECL(int) FTMR3PowerOn(PVM pVM, bool fMaster, unsigned uInterval, const char *pszAddress, unsigned uPort, const char *pszPassword)
-{
-    int rc = VINF_SUCCESS;
+VMMR3DECL(int) FTMR3PowerOn(PUVM pUVM, bool fMaster, unsigned uInterval,
+                            const char *pszAddress, unsigned uPort, const char *pszPassword)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
+    PVM pVM = pUVM->pVM;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
 
     VMSTATE enmVMState = VMR3GetState(pVM);
@@ -1156 +1160 @@
         pVM->ftm.s.pszPassword  = RTStrDup(pszPassword);
 
-    rc = RTSemEventCreate(&pVM->ftm.s.hShutdownEvent);
+    int rc = RTSemEventCreate(&pVM->ftm.s.hShutdownEvent);
     if (RT_FAILURE(rc))
         return rc;
@@ -1213 +1217 @@
  * @returns VBox status code.
  *
- * @param   pVM         Pointer to the VM.
- */
-VMMR3DECL(int) FTMR3CancelStandby(PVM pVM)
-{
+ * @param   pUVM        The user mode VM handle.
+ */
+VMMR3DECL(int) FTMR3CancelStandby(PUVM pUVM)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
+    PVM pVM = pUVM->pVM;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
     AssertReturn(!pVM->fFaultTolerantMaster, VERR_NOT_SUPPORTED);
     Assert(pVM->ftm.s.standby.hServer);
@@ -1302 +1309 @@
  * @param   enmCheckpoint   Checkpoint type
  */
-VMMR3DECL(int) FTMR3SetCheckpoint(PVM pVM, FTMCHECKPOINTTYPE enmCheckpoint)
+VMMR3_INT_DECL(int) FTMR3SetCheckpoint(PVM pVM, FTMCHECKPOINTTYPE enmCheckpoint)
 {
     int rc;
@@ -1311 +1318 @@
     switch (enmCheckpoint)
     {
-    case FTMCHECKPOINTTYPE_NETWORK:
-        STAM_REL_COUNTER_INC(&pVM->ftm.s.StatCheckpointNetwork);
-        break;
-
-    case FTMCHECKPOINTTYPE_STORAGE:
-        STAM_REL_COUNTER_INC(&pVM->ftm.s.StatCheckpointStorage);
-        break;
-
-    default:
-        break;
-    }
+        case FTMCHECKPOINTTYPE_NETWORK:
+            STAM_REL_COUNTER_INC(&pVM->ftm.s.StatCheckpointNetwork);
+            break;
+
+        case FTMCHECKPOINTTYPE_STORAGE:
+            STAM_REL_COUNTER_INC(&pVM->ftm.s.StatCheckpointStorage);
+            break;
+
+        default:
+            AssertMsgFailedReturn(("%d\n", enmCheckpoint), VERR_INVALID_PARAMETER);
+    }
+
     pVM->ftm.s.fCheckpointingActive = true;
     if (VM_IS_EMT(pVM))