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

Timestamp:

Jan 25, 2011 12:53:39 PM (14 years ago)

Author:

vboxsync

Message:

VBoxManage: allow tot save the state of a VM which is already paused

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.h (modified) (1 diff)
• VBoxManageControlVM.cpp (modified) (1 diff)
• VBoxManageGuestCtrl.cpp (modified) (1 diff)
• VBoxManageInfo.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -194 +194 @@
                    VMINFO_DETAILS details = VMINFO_NONE,
                    ComPtr <IConsole> console = ComPtr<IConsole>());
+const char *stateToName(MachineState_T machineState, bool fShort);
 
 /* VBoxManageList.cpp */

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

@@ -162 +162 @@
         {
             /* first pause so we don't trigger a live save which needs more time/resources */
-            CHECK_ERROR_BREAK(console, Pause());
+            rc = console->Pause();
+            if (FAILED(rc))
+            {
+                if (rc == VBOX_E_INVALID_VM_STATE)
+                {
+                    /* check if we are already paused */
+                    MachineState_T machineState;
+                    CHECK_ERROR_BREAK(console, COMGETTER(State)(&machineState));
+                    if (machineState != MachineState_Paused)
+                    {
+                        RTMsgError("Machine in invalid state %d -- %s\n",
+                                   machineState, stateToName(machineState, false));
+                        break;
+                    }
+                }
+            }
 
             ComPtr<IProgress> progress;

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

@@ -256 +256 @@
     if (machineState != MachineState_Running)
     {
-        RTMsgError("Machine \"%s\" is not running!\n", pszNameOrId);
+        RTMsgError("Machine \"%s\" is not running (currently %s)!\n",
+                   pszNameOrId, stateToName(machineState, false));
         return VERR_VM_INVALID_VM_STATE;
     }

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

@@ -109 +109 @@
                         t.i32Year, t.u8Month, t.u8MonthDay,
                         t.u8Hour, t.u8Minute, t.u8Second);
+}
+
+
+const char *stateToName(MachineState_T machineState, bool fShort)
+{
+    switch (machineState)
+    {
+        case MachineState_PoweredOff:
+            return fShort ? "poweroff"             : "powered off";
+        case MachineState_Saved:
+            return "saved";
+        case MachineState_Aborted:
+            return "aborted";
+        case MachineState_Teleported:
+            return "teleported";
+        case MachineState_Running:
+            return "running";
+        case MachineState_Paused:
+            return "paused";
+        case MachineState_Stuck:
+            return fShort ? "gurumeditation"       : "guru meditation";
+        case MachineState_LiveSnapshotting:
+            return fShort ? "livesnapshotting"     : "live snapshotting";
+        case MachineState_Teleporting:
+            return "teleporting";
+        case MachineState_Starting:
+            return "starting";
+        case MachineState_Stopping:
+            return "stopping";
+        case MachineState_Saving:
+            return "saving";
+        case MachineState_Restoring:
+            return "restoring";
+        case MachineState_TeleportingPausedVM:
+            return fShort ? "teleportingpausedvm"  : "teleporting paused vm";
+        case MachineState_TeleportingIn:
+            return fShort ? "teleportingin"        : "teleporting (incoming)";
+        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";
+        default:
+            return "unknown";
+    }
 }
 
@@ -518 +568 @@
 
     MachineState_T machineState;
-    const char *pszState = NULL;
     rc = machine->COMGETTER(State)(&machineState);
-    switch (machineState)
-    {
-        case MachineState_PoweredOff:
-            pszState = details == VMINFO_MACHINEREADABLE ? "poweroff"            : "powered off";
-            break;
-        case MachineState_Saved:
-            pszState = "saved";
-            break;
-        case MachineState_Aborted:
-            pszState = "aborted";
-            break;
-        case MachineState_Teleported:
-            pszState = "teleported";
-            break;
-        case MachineState_Running:
-            pszState = "running";
-            break;
-        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:
-            pszState = "starting";
-            break;
-        case MachineState_Stopping:
-            pszState = "stopping";
-            break;
-        case MachineState_Saving:
-            pszState = "saving";
-            break;
-        case MachineState_Restoring:
-            pszState = "restoring";
-            break;
-        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";
-            break;
-        case MachineState_DeletingSnapshot:
-            pszState = details == VMINFO_MACHINEREADABLE ? "deletingsnapshot"    : "deleting snapshot";
-            break;
-        case MachineState_DeletingSnapshotOnline:
-            pszState = details == VMINFO_MACHINEREADABLE ? "deletingsnapshotlive" : "deleting snapshot live";
-            break;
-        case MachineState_DeletingSnapshotPaused:
-            pszState = details == VMINFO_MACHINEREADABLE ? "deletingsnapshotlivepaused" : "deleting snapshot live paused";
-            break;
-        case MachineState_SettingUp:
-            pszState = details == VMINFO_MACHINEREADABLE ? "settingup"           : "setting up";
-            break;
-        default:
-            pszState = "unknown";
-            break;
-    }
+    const char *pszState = stateToName(machineState, details == VMINFO_MACHINEREADABLE /*=fShort*/);
+
     LONG64 stateSince;
     machine->COMGETTER(LastStateChange)(&stateSince);