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

Timestamp:

Aug 16, 2010 11:19:25 AM (15 years ago)

Author:

vboxsync

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

64831

Message:

New state

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (3 diffs)
• idl/VirtualBox.xidl (modified) (7 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2619 +2619 @@
 
     /* @todo deal with running state change. */
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc;
 
     setModified(IsModified_MachineData);
@@ -2647 +2649 @@
 
     /* @todo deal with running state change. */
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc;
 
     setModified(IsModified_MachineData);
@@ -2675 +2679 @@
 
     /* @todo deal with running state change. */
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc;
 
     setModified(IsModified_MachineData);

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

@@ -490 +490 @@
   <enum
     name="MachineState"
-    uuid="e998d075-543a-41fc-8aa9-5ca3e92393fd"
+    uuid="ec6c6a9e-113d-4ff4-b44f-0b69f21c97fe"
   >
     <desc>
@@ -733 +733 @@
       </desc>
     </const>
-    <const name="DeletingSnapshotOnline" value="16">
+    <const name="FaultTolerantSyncing"   value="16">
+      <desc>
+        The machine is being synced with a fault tolerant VM running elsewhere.
+      </desc>
+    </const>
+    <const name="DeletingSnapshotOnline" value="17">
       <desc>
         Like @c DeletingSnapshot, but the merging of media is ongoing in
@@ -739 +744 @@
       </desc>
     </const>
-    <const name="DeletingSnapshotPaused" value="17">
+    <const name="DeletingSnapshotPaused" value="18">
       <desc>
         Like @c DeletingSnapshotOnline, but the machine was paused when the
@@ -745 +750 @@
       </desc>
     </const>
-    <const name="RestoringSnapshot"     value="18">
+    <const name="RestoringSnapshot"     value="19">
       <desc>
         A machine snapshot is being restored; this typically does not take long.
       </desc>
     </const>
-    <const name="DeletingSnapshot"      value="19">
+    <const name="DeletingSnapshot"      value="20">
       <desc>
         A machine snapshot is being deleted; this can take a long time since this
@@ -757 +762 @@
       </desc>
     </const>
-    <const name="SettingUp"             value="20">
+    <const name="SettingUp"             value="21">
       <desc>
         Lengthy setup operation is in progress.
@@ -768 +773 @@
       </desc>
     </const>
-    <const name="LastOnline"  value="17" wsmap="suppress"> <!-- DeletingSnapshotPaused -->
+    <const name="LastOnline"  value="18" wsmap="suppress"> <!-- DeletingSnapshotPaused -->
       <desc>
         Pseudo-state: last online state (for use in relational expressions).
@@ -779 +784 @@
       </desc>
     </const>
-    <const name="LastTransient"  value="20" wsmap="suppress"> <!-- SettingUp -->
+    <const name="LastTransient"  value="21" wsmap="suppress"> <!-- SettingUp -->
       <desc>
         Pseudo-state: last transient state (for use in relational expressions).