Changeset 55214 in vbox for trunk/src/VBox/Frontends/VBoxAutostart

Timestamp:

Apr 13, 2015 3:53:01 PM (10 years ago)

Author:

vboxsync

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

99520

Message:

Main/Console+Machine+Session+Snapshot: move the save state and snapshot related methods from IConsole to IMachine, with lots of unavoidable code restructuring and cleanup. Also define two new machine states (so that the "Saving" one is specifically for saving state now) which requires more changes everywhere
Frontends: necessary adjustments
doc/SDK: document the changes

Location:

trunk/src/VBox/Frontends/VBoxAutostart

Files:

• VBoxAutostartStop.cpp (modified) (2 diffs)
• VBoxAutostartUtils.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartStop.cpp

@@ -51 +51 @@
 {
     HRESULT rc = S_OK;
+    ComPtr<IMachine> machine;
     ComPtr<IProgress> progress;
 
@@ -83 +84 @@
         }
 
-        CHECK_ERROR(console, SaveState(progress.asOutParam()));
+        CHECK_ERROR(console, COMGETTER(Machine)(machine.asOutParam()));
+        CHECK_ERROR(machine, SaveState(progress.asOutParam()));
         if (FAILED(rc))
         {

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartUtils.cpp

@@ -48 +48 @@
         case MachineState_Saved:
             return "saved";
+        case MachineState_Teleported:
+            return "teleported";
         case MachineState_Aborted:
             return "aborted";
-        case MachineState_Teleported:
-            return "teleported";
         case MachineState_Running:
             return "running";
@@ -58 +58 @@
         case MachineState_Stuck:
             return fShort ? "gurumeditation"       : "guru meditation";
+        case MachineState_Teleporting:
+            return "teleporting";
         case MachineState_LiveSnapshotting:
             return fShort ? "livesnapshotting"     : "live snapshotting";
-        case MachineState_Teleporting:
-            return "teleporting";
         case MachineState_Starting:
             return "starting";
@@ -74 +74 @@
         case MachineState_TeleportingIn:
             return fShort ? "teleportingin"        : "teleporting (incoming)";
+        case MachineState_DeletingSnapshotOnline:
+            return fShort ? "deletingsnapshotlive" : "deleting snapshot live";
+        case MachineState_DeletingSnapshotPaused:
+            return fShort ? "deletingsnapshotlivepaused" : "deleting snapshot live paused";
+        case MachineState_OnlineSnapshotting:
+            return fShort ? "onlinesnapshotting"   : "online snapshotting";
         case MachineState_RestoringSnapshot:
             return fShort ? "restoringsnapshot"    : "restoring snapshot";
         case MachineState_DeletingSnapshot:
             return fShort ? "deletingsnapshot"     : "deleting snapshot";
-        case MachineState_DeletingSnapshotOnline:
-            return fShort ? "deletingsnapshotlive" : "deleting snapshot live";
-        case MachineState_DeletingSnapshotPaused:
-            return fShort ? "deletingsnapshotlivepaused" : "deleting snapshot live paused";
         case MachineState_SettingUp:
             return fShort ? "settingup"           : "setting up";
+        case MachineState_Snapshotting:
+            return "snapshotting";
         default:
             break;