Changeset 25755 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 12, 2010 11:59:39 AM (15 years ago)

Author:

vboxsync

Message:

VBoxManage: add snapshot <vm> restorecurrent command

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageSnapshot.cpp (modified) (3 diffs)

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

@@ -356 +356 @@
                  "                            delete <uuid>|<name> |\n"
                  "                            restore <uuid>|<name> |\n"
+                 "                            restorecurrent |\n"
                  "                            edit <uuid>|<name>|--current\n"
                  "                                 [--name <name>]\n"

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

@@ -253 +253 @@
 
         /* switch based on the command */
-        bool fDelete = false, fRestore = false;
+        bool fDelete = false,
+             fRestore = false,
+             fRestoreCurrent = false;
+
         if (!strcmp(a->argv[1], "take"))
         {
@@ -339 +342 @@
         else if (    (fDelete = !strcmp(a->argv[1], "delete"))
                   || (fRestore = !strcmp(a->argv[1], "restore"))
+                  || (fRestoreCurrent = !strcmp(a->argv[1], "restorecurrent"))
                 )
         {
+            if (fRestoreCurrent)
+            {
+                if (a->argc > 2)
+                {
+                    errorSyntax(USAGE_SNAPSHOT, "Too many arguments");
+                    rc = E_FAIL;
+                    break;
+                }
+            }
             /* exactly one parameter: snapshot name */
-            if (a->argc != 3)
+            else if (a->argc != 3)
             {
                 errorSyntax(USAGE_SNAPSHOT, "Expecting snapshot name only");
@@ -350 +363 @@
 
             ComPtr<ISnapshot> pSnapshot;
-
-            /* assume it's a UUID */
-            Bstr guidSnap(a->argv[2]);
-            if (!guidSnap.isEmpty())
-            {
-                CHECK_ERROR_BREAK(pMachine, GetSnapshot(guidSnap, pSnapshot.asOutParam()));
+            ComPtr<IProgress> pProgress;
+            Bstr bstrSnapGuid;
+
+            if (fRestoreCurrent)
+            {
+                CHECK_ERROR_BREAK(pMachine, COMGETTER(CurrentSnapshot)(pSnapshot.asOutParam()));
+                CHECK_ERROR_BREAK(pSnapshot, COMGETTER(Id)(bstrSnapGuid.asOutParam()));
             }
             else
             {
-                /* then it must be a name */
-                CHECK_ERROR_BREAK(pMachine, FindSnapshot(Bstr(a->argv[2]), pSnapshot.asOutParam()));
-                pSnapshot->COMGETTER(Id)(guidSnap.asOutParam());
-            }
-
-            ComPtr<IProgress> pProgress;
+                // restore or delete snapshot: then resolve cmd line argument to snapshot instance
+                // assume it's a UUID
+                bstrSnapGuid = a->argv[2];
+                if (FAILED(pMachine->GetSnapshot(bstrSnapGuid, pSnapshot.asOutParam())))
+                {
+                    // then it must be a name
+                    CHECK_ERROR_BREAK(pMachine, FindSnapshot(Bstr(a->argv[2]), pSnapshot.asOutParam()));
+                    CHECK_ERROR_BREAK(pSnapshot, COMGETTER(Id)(bstrSnapGuid.asOutParam()));
+                }
+            }
+
             if (fDelete)
             {
-                CHECK_ERROR_BREAK(console, DeleteSnapshot(guidSnap, pProgress.asOutParam()));
+                CHECK_ERROR_BREAK(console, DeleteSnapshot(bstrSnapGuid, pProgress.asOutParam()));
             }
             else
             {
-                // must be restore
+                // restore or restore current
+                RTPrintf("Restoring snapshot %ls\n", bstrSnapGuid.raw());
                 CHECK_ERROR_BREAK(console, RestoreSnapshot(pSnapshot, pProgress.asOutParam()));
             }