Changeset 24301 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Nov 3, 2009 10:07:55 PM (15 years ago)

Author:

vboxsync

Message:

Main,Frontends: Added two new running states: Teleporting and LiveSnapshotting. Also added TeleportingPausedVM. Renamed TeleportingFrom to TeleportingIn.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageInfo.cpp (modified) (4 diffs)
• VBoxManageList.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -403 +403 @@
     {
         case MachineState_PoweredOff:
-            if (details == VMINFO_MACHINEREADABLE)
-                pszState = "poweroff";
-            else
-                pszState = "powered off";
+            pszState = details == VMINFO_MACHINEREADABLE ? "poweroff"            : "powered off";
             break;
         case MachineState_Saved:
@@ -414 +411 @@
             pszState = "aborted";
             break;
+        case MachineState_Teleported:
+            pszState = "teleported";
+            break;
         case MachineState_Running:
             pszState = "running";
@@ -419 +419 @@
         case MachineState_Paused:
             pszState = "paused";
+            break;
+        case MachineState_Stuck:
+            pszState = details == VMINFO_MACHINEREADABLE ? "gurumeditation"      : "guru meditation";
+            break;
+        case MachineState_LiveSnapshotting:
+            pszState = details == VMINFO_MACHINEREADABLE ? "livesnapshotting"    : "live snapshotting";
+            break;
+        case MachineState_Teleporting:
+            pszState = "teleporting";
             break;
         case MachineState_Starting:
@@ -432 +441 @@
             pszState = "restoring";
             break;
-        case MachineState_TeleportingFrom:
-            if (details == VMINFO_MACHINEREADABLE)
-                pszState = "teleportingfrom";
-            else
-                pszState = "teleporting from";
+        case MachineState_TeleportingPausedVM:
+            pszState = details == VMINFO_MACHINEREADABLE ? "teleportingpausedvm" : "teleporting paused vm";
+            break;
+        case MachineState_TeleportingIn:
+            pszState = details == VMINFO_MACHINEREADABLE ? "teleportingin"       : "teleporting (incoming)";
+            break;
+        case MachineState_RestoringSnapshot:
+            pszState = details == VMINFO_MACHINEREADABLE ? "restoringsnapshot"   : "restoring snapshot";
+        case MachineState_DeletingSnapshot:
+            pszState = details == VMINFO_MACHINEREADABLE ? "deletingsnapshot"    : "deleting snapshot";
+        case MachineState_SettingUp:
+            pszState = details == VMINFO_MACHINEREADABLE ? "settingup"           : "setting up";
             break;
         default:

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -230 +230 @@
                             {
                                 case MachineState_Running:
+                                case MachineState_Teleporting:
+                                case MachineState_LiveSnapshotting:
                                 case MachineState_Paused:
+                                case MachineState_TeleportingPausedVM:
                                     rc = showVMInfo(a->virtualBox,
                                                     machines[i],