Changeset 38393 in vbox for trunk/src

Timestamp:

Aug 10, 2011 10:25:56 AM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 5809: Taking a snapshot for a running VM through the VM manager will now take online snapshot instead of live one.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp

@@ -765 +765 @@
 bool VBoxSnapshotsWgt::takeSnapshot()
 {
+    /* Prepare result: */
+    bool fIsValid = true;
+
     /* Get currently chosen item: */
-    SnapshotWgtItem *pItem = mTreeWidget->currentItem() ? static_cast <SnapshotWgtItem*>(mTreeWidget->currentItem()) : 0;
+    SnapshotWgtItem *pItem = mTreeWidget->currentItem() ? static_cast<SnapshotWgtItem*>(mTreeWidget->currentItem()) : 0;
     AssertReturn(pItem, (bool)0);
 
-    /* Create 'take new snapshot' dialog: */
-    VBoxTakeSnapshotDlg dlg(this, mMachine);
-    dlg.mLbIcon->setPixmap(vboxGlobal().vmGuestOSTypeIcon(mMachine.GetOSTypeId()));
-
-    /* Search for the max available filter index: */
-    int iMaxSnapShotIndex = 0;
-    QString snapShotName = tr("Snapshot %1");
-    QRegExp regExp(QString("^") + snapShotName.arg("([0-9]+)") + QString("$"));
-    QTreeWidgetItemIterator iterator(mTreeWidget);
-    while (*iterator)
-    {
-        QString snapShot = static_cast<SnapshotWgtItem*>(*iterator)->text(0);
-        int pos = regExp.indexIn(snapShot);
-        if (pos != -1)
-            iMaxSnapShotIndex = regExp.cap(1).toInt() > iMaxSnapShotIndex ? regExp.cap(1).toInt() : iMaxSnapShotIndex;
-        ++iterator;
-    }
-    dlg.mLeName->setText(snapShotName.arg(iMaxSnapShotIndex + 1));
-
-    /* Show 'take new snapshot' dialog: */
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        /* Open a direct session (this call will handle all errors): */
-        bool busy = mSessionState != KSessionState_Unlocked;
-        CSession session = vboxGlobal().openSession(mMachineId, busy /* aExisting */);
-        if (session.isNull())
-            return false;
-
-        /* Take new snapshot: */
+    /* Open a session to work with corresponding VM: */
+    CSession session = vboxGlobal().openSession(mMachineId,
+                                                mSessionState != KSessionState_Unlocked /* connect to existing */);
+    fIsValid = !session.isNull();
+
+    if (fIsValid)
+    {
+        /* Get corresponding console object also: */
         CConsole console = session.GetConsole();
-        CProgress progress = console.TakeSnapshot(dlg.mLeName->text().trimmed(), dlg.mTeDescription->toPlainText());
-        if (console.isOk())
-        {
-            /* Show the progress dialog */
-            msgCenter().showModalProgressDialog(progress, mMachine.GetName(), ":/progress_snapshot_create_90px.png",
-                                                  msgCenter().mainWindowShown(), true);
-            if (progress.GetResultCode() != 0)
-                msgCenter().cannotTakeSnapshot(progress);
-        }
-        else
-            msgCenter().cannotTakeSnapshot(console);
+        /* Remember runtime state: */
+        bool fAtRuntime = mMachine.GetState() == KMachineState_Running;
+        /* Remember paused state: */
+        bool fWasPaused = mMachine.GetState() == KMachineState_Paused ||
+                          mMachine.GetState() == KMachineState_TeleportingPausedVM;
+
+        /* Pause VM if necessary: */
+        if (fIsValid && fAtRuntime && !fWasPaused)
+        {
+            /* Pausing VM: */
+            console.Pause();
+            if (!console.isOk())
+            {
+                msgCenter().cannotPauseMachine(console);
+                fIsValid = false;
+            }
+        }
+
+        /* Create 'take new snapshot' dialog: */
+        if (fIsValid)
+        {
+            /* Prepare dialog: */
+            VBoxTakeSnapshotDlg dlg(this, mMachine);
+            dlg.mLbIcon->setPixmap(vboxGlobal().vmGuestOSTypeIcon(mMachine.GetOSTypeId()));
+
+            /* Search for the max available snapshot index: */
+            int iMaxSnapShotIndex = 0;
+            QString snapShotName = tr("Snapshot %1");
+            QRegExp regExp(QString("^") + snapShotName.arg("([0-9]+)") + QString("$"));
+            QTreeWidgetItemIterator iterator(mTreeWidget);
+            while (*iterator)
+            {
+                QString snapShot = static_cast<SnapshotWgtItem*>(*iterator)->text(0);
+                int pos = regExp.indexIn(snapShot);
+                if (pos != -1)
+                    iMaxSnapShotIndex = regExp.cap(1).toInt() > iMaxSnapShotIndex ? regExp.cap(1).toInt() : iMaxSnapShotIndex;
+                ++iterator;
+            }
+            dlg.mLeName->setText(snapShotName.arg(iMaxSnapShotIndex + 1));
+
+            /* Show 'take new snapshot' dialog: */
+            if (dlg.exec() == QDialog::Accepted)
+            {
+                /* Take new snapshot: */
+                CProgress progress = console.TakeSnapshot(dlg.mLeName->text().trimmed(), dlg.mTeDescription->toPlainText());
+                if (console.isOk())
+                {
+                    /* Show the progress dialog: */
+                    msgCenter().showModalProgressDialog(progress, mMachine.GetName(), ":/progress_snapshot_create_90px.png",
+                                                        msgCenter().mainWindowShown(), true);
+                    if (progress.GetResultCode() != 0)
+                    {
+                        msgCenter().cannotTakeSnapshot(progress);
+                        fIsValid = false;
+                    }
+                }
+                else
+                {
+                    msgCenter().cannotTakeSnapshot(console);
+                    fIsValid = false;
+                }
+            }
+        }
+
+        /* Resume VM if necessary: */
+        if (fIsValid && fAtRuntime && !fWasPaused)
+        {
+            /* Resuming VM: */
+            console.Resume();
+            if (!console.isOk())
+            {
+                msgCenter().cannotResumeMachine(console);
+                fIsValid = false;
+            }
+        }
 
         /* Unlock machine finally: */
         session.UnlockMachine();
-
-        return true;
-    }
-    return false;
+    }
+
+    /* Return result: */
+    return fIsValid;
 }