Changeset 31731 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 17, 2010 1:43:49 PM (15 years ago)

Author:

vboxsync

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

64903

Message:

Terminology

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (4 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -5217 +5217 @@
     rc = mMachine->COMGETTER(FaultToleranceState)(&enmFaultToleranceState);
     if (FAILED(rc)) return rc;
-    BOOL fFaultToleranceSyncEnabled = (enmFaultToleranceState == FaultToleranceState_Target);
+    BOOL fFaultToleranceSyncEnabled = (enmFaultToleranceState == FaultToleranceState_Clone);
 
     /* create a progress object to track progress of this operation */
@@ -5399 +5399 @@
     else if (fTeleporterEnabled)
         setMachineState(MachineState_TeleportingIn);
-    else if (enmFaultToleranceState == FaultToleranceState_Target)
+    else if (enmFaultToleranceState == FaultToleranceState_Clone)
         setMachineState(MachineState_FaultTolerantSyncing);
     else
@@ -7274 +7274 @@
          */
         if (    !task->mTeleporterEnabled
-            &&  task->mEnmFaultToleranceState != FaultToleranceState_Target)
+            &&  task->mEnmFaultToleranceState != FaultToleranceState_Clone)
         {
             rc = console->mControl->LockMedia();
@@ -7478 +7478 @@
 
                         /* Power on the FT enabled VM. */
-                        vrc = FTMR3PowerOn(pVM, (task->mEnmFaultToleranceState == FaultToleranceState_Source) /* fSource */, uInterval, pszAddress, uPort);
+                        vrc = FTMR3PowerOn(pVM, (task->mEnmFaultToleranceState == FaultToleranceState_Master) /* fMaster */, uInterval, pszAddress, uPort);
                         AssertRC(vrc);
                     }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -912 +912 @@
   <enum
    name="FaultToleranceState"
-   uuid="05f65593-743e-4862-8700-57bf6cc48f3f"
+   uuid="5124f7ec-6b67-493c-9dee-ee45a44114e1"
   >
     <desc>
@@ -920 +920 @@
       <desc>No fault tolerance enabled.</desc>
     </const>
-    <const name="Source" value="2">
-      <desc>Fault tolerant source VM.</desc>
-    </const>
-    <const name="Target" value="3">
-      <desc>Fault tolerant target VM.</desc>
+    <const name="Master" value="2">
+      <desc>Fault tolerant master VM.</desc>
+    </const>
+    <const name="Clone" value="3">
+      <desc>Fault tolerant clone VM.</desc>
     </const>
   </enum>

trunk/src/VBox/Main/xml/Settings.cpp

@@ -3113 +3113 @@
                 if (pelmMachineChild->getAttributeValue("state", strFaultToleranceSate))
                 {
-                    if (strFaultToleranceSate == "source")
-                        machineUserData.enmFaultToleranceState = FaultToleranceState_Source;
+                    if (strFaultToleranceSate == "master")
+                        machineUserData.enmFaultToleranceState = FaultToleranceState_Master;
                     else
-                    if (strFaultToleranceSate == "target")
-                        machineUserData.enmFaultToleranceState = FaultToleranceState_Target;
+                    if (strFaultToleranceSate == "clone")
+                        machineUserData.enmFaultToleranceState = FaultToleranceState_Clone;
                     else
                         machineUserData.enmFaultToleranceState = FaultToleranceState_Inactive;
@@ -4042 +4042 @@
             pelmFaultTolerance->setAttribute("state", "inactive");
             break;
-        case FaultToleranceState_Source:
-            pelmFaultTolerance->setAttribute("state", "source");
+        case FaultToleranceState_Master:
+            pelmFaultTolerance->setAttribute("state", "master");
             break;
-        case FaultToleranceState_Target:
-            pelmFaultTolerance->setAttribute("state", "target");
+        case FaultToleranceState_Clone:
+            pelmFaultTolerance->setAttribute("state", "clone");
             break;
         }