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

Timestamp:

Jul 30, 2024 11:59:31 PM (6 months ago)

Author:

vboxsync

Message:

FE/Qt: Added --restore-snapshot[=:]<name> option to VirtualBoxVM to make it simpler to work with snapshots from the command line. bugref:10727

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (2 diffs)
• globals/UICommon.h (modified) (2 diffs)
• main.cpp (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -163 +163 @@
     , m_fAgressiveCaching(true)
 #endif
+    , m_fNoKeyboardGrabbing(false)
     , m_fRestoreCurrentSnapshot(false)
-    , m_fNoKeyboardGrabbing(false)
     , m_fExecuteAllInIem(false)
     , m_uWarpPct(100)
@@ -430 +430 @@
             enmOptType = OptType_VMRunner;
             m_fRestoreCurrentSnapshot = true;
+            m_strSnapshotToRestore.clear();
+        }
+        else if (   !::strcmp(arg, "--restore-snapshot")
+                 || !::strncmp(arg, RT_STR_TUPLE("--restore-snapshot="))
+                 || !::strncmp(arg, RT_STR_TUPLE("--restore-snapshot:")))
+        {
+            enmOptType = OptType_VMRunner;
+            const char * const pszSep = &arg[sizeof("--restore-snapshot") - 1];
+            if (*pszSep != '\0')
+                m_strSnapshotToRestore = &pszSep[1];
+            else if (++i < argc)
+                m_strSnapshotToRestore = arguments.at(i);
+            else
+                m_strSnapshotToRestore.clear();
+            m_fRestoreCurrentSnapshot = false;
         }
         else if (!::strcmp(arg, "--no-keyboard-grabbing"))

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -168 +168 @@
         /** Returns the --restore-current option value (whether we should restore current snapshot before VM started). */
         bool shouldRestoreCurrentSnapshot() const { return m_fRestoreCurrentSnapshot; }
-        /** Defines whether we should fRestore current snapshot before VM started. */
-        void setShouldRestoreCurrentSnapshot(bool fRestore) { m_fRestoreCurrentSnapshot = fRestore; }
+        /** Returns the --restore-snapshot option value (whether to restore named snapshot before starting VM). */
+        QString const &getSnapshotToRestore() const { return m_strSnapshotToRestore; }
+        /** Clears the --restore-current and --restore-snapshot option values. */
+        void clearSnapshotRestoreOptions() { m_fRestoreCurrentSnapshot = false; m_strSnapshotToRestore.clear(); }
 
         /** Returns the --no-keyboard-grabbing option value (whether we should restore
@@ -403 +405 @@
         bool  m_fAgressiveCaching;
 
-        /** Holds the --restore-current option value. */
-        bool  m_fRestoreCurrentSnapshot;
-
         /** Holds the --no-keyboard-grabbing option value. */
         bool  m_fNoKeyboardGrabbing;
+
+        /** Holds the --restore-current option value. */
+        bool    m_fRestoreCurrentSnapshot;
+        /** Holds the --restore-snapshot option value. */
+        QString m_strSnapshotToRestore;
 
         /** Holds the --fda option value (floppy image). */

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -281 +281 @@
         "  --no-startvm-errormsgbox   do not show a message box for VM start errors\n"
         "  --restore-current          restore the current snapshot before starting\n"
+        "  --restore-snapshot=<name>  restore the named snapshot before starting\n"
         "  --no-aggressive-caching    delays caching media info in VM processes\n"
         "  --fda <image|none>         Mount the specified floppy image\n"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -123 +123 @@
 
     /* Restore current snapshot if requested: */
-    if (uiCommon().shouldRestoreCurrentSnapshot())
+    if (   uiCommon().shouldRestoreCurrentSnapshot()
+        || !uiCommon().getSnapshotToRestore().isEmpty())
     {
         /* Create temporary session: */
@@ -132 +133 @@
         /* Which VM we operate on? */
         CMachine comMachine = comSession.GetMachine();
-        /* Which snapshot we are restoring? */
-        CSnapshot comSnapshot = comMachine.GetCurrentSnapshot();
+        /* Which snapshot are we restoring? */
+        CSnapshot comSnapshot = uiCommon().shouldRestoreCurrentSnapshot()
+                              ? comMachine.GetCurrentSnapshot()
+                              : comMachine.FindSnapshot(uiCommon().getSnapshotToRestore());
 
         /* Prepare restore-snapshot progress: */
         CProgress comProgress = comMachine.RestoreSnapshot(comSnapshot);
         if (!comMachine.isOk())
-            return msgCenter().cannotRestoreSnapshot(comMachine, comSnapshot.GetName(), comMachine.GetName());
+            return msgCenter().cannotRestoreSnapshot(comMachine,
+                                                     comSnapshot.isOk() ? comSnapshot.GetName()
+                                                     /** @todo deal better with snapshot-not found issues: */
+                                                     : uiCommon().shouldRestoreCurrentSnapshot() ? "current"
+                                                     : uiCommon().getSnapshotToRestore(),
+                                                     comMachine.GetName());
 
         /* Show the snapshot-discarding progress: */
@@ -149 +157 @@
 
         /* Clear snapshot-restoring request: */
-        uiCommon().setShouldRestoreCurrentSnapshot(false);
+        uiCommon().clearSnapshotRestoreOptions();
     }