Changeset 98926 in vbox for trunk

Timestamp:

Mar 13, 2023 10:05:36 AM (23 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: A bit of cleanup and sanity for openSession and startMachine stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -1334 +1334 @@
 }
 
-CSession UICommon::openSession(const QUuid &uId, KLockType lockType /* = KLockType_Shared */)
+CSession UICommon::openSession(QUuid uId, KLockType enmLockType /* = KLockType_Write */)
 {
     /* Prepare session: */
     CSession comSession;
+
+    /* Make sure uId isn't null: */
+    if (uId.isNull())
+        uId = managedVMUuid();
+    if (uId.isNull())
+        return comSession;
 
     /* Simulate try-catch block: */
@@ -1359 +1365 @@
         }
 
-        if (lockType == KLockType_VM)
+        if (enmLockType == KLockType_VM)
             comSession.SetName("GUI/Qt");
 
         /* Lock found machine to session: */
-        comMachine.LockMachine(comSession, lockType);
+        comMachine.LockMachine(comSession, enmLockType);
         if (!comMachine.isOk())
         {
@@ -1391 +1397 @@
     /* Return session: */
     return comSession;
+}
+
+CSession UICommon::openSession(KLockType enmLockType /* = KLockType_Write */)
+{
+    /* Pass to function above: */
+    return openSession(managedVMUuid(), enmLockType);
 }
 

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

@@ -336 +336 @@
 
         /** Opens session of certain @a enmLockType for VM with certain @a uId. */
-        CSession openSession(const QUuid &uId, KLockType enmLockType = KLockType_Write);
+        CSession openSession(QUuid uId, KLockType enmLockType = KLockType_Write);
+        /** Opens session of certain @a enmLockType for currently chosen VM. */
+        CSession openSession(KLockType enmLockType = KLockType_Write);
         /** Opens session of KLockType_Shared type for VM with certain @a uId. */
         CSession openExistingSession(const QUuid &uId) { return openSession(uId, KLockType_Shared); }

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

@@ -101 +101 @@
 
     /* Try to start virtual machine, quit if failed: */
-    if (!UIMachine::startMachine(uiCommon().managedVMUuid()))
+    if (!UIMachine::startMachine())
         return QApplication::quit();
 

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

@@ -113 +113 @@
 
 /* static */
-bool UIMachine::startMachine(const QUuid &uID)
+bool UIMachine::startMachine()
 {
     /* Make sure machine is not created: */
@@ -122 +122 @@
     {
         /* Create temporary session: */
-        CSession session = uiCommon().openSession(uID, KLockType_VM);
-        if (session.isNull())
+        CSession comSession = uiCommon().openSession(KLockType_VM);
+        if (comSession.isNull())
             return false;
 
         /* Which VM we operate on? */
-        CMachine machine = session.GetMachine();
+        CMachine comMachine = comSession.GetMachine();
         /* Which snapshot we are restoring? */
-        CSnapshot snapshot = machine.GetCurrentSnapshot();
+        CSnapshot comSnapshot = comMachine.GetCurrentSnapshot();
 
         /* Prepare restore-snapshot progress: */
-        CProgress progress = machine.RestoreSnapshot(snapshot);
-        if (!machine.isOk())
-            return msgCenter().cannotRestoreSnapshot(machine, snapshot.GetName(), machine.GetName());
+        CProgress comProgress = comMachine.RestoreSnapshot(comSnapshot);
+        if (!comMachine.isOk())
+            return msgCenter().cannotRestoreSnapshot(comMachine, comSnapshot.GetName(), comMachine.GetName());
 
         /* Show the snapshot-discarding progress: */
-        msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_snapshot_discard_90px.png");
-        if (progress.GetResultCode() != 0)
-            return msgCenter().cannotRestoreSnapshot(progress, snapshot.GetName(), machine.GetName());
+        msgCenter().showModalProgressDialog(comProgress, comMachine.GetName(), ":/progress_snapshot_discard_90px.png");
+        if (comProgress.GetResultCode() != 0)
+            return msgCenter().cannotRestoreSnapshot(comProgress, comSnapshot.GetName(), comMachine.GetName());
 
         /* Unlock session finally: */
-        session.UnlockMachine();
+        comSession.UnlockMachine();
 
         /* Clear snapshot-restoring request: */

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

@@ -154 +154 @@
 public:
 
-    /** Static factory to start machine with passed @a uID.
-      * @return true if machine was started, false otherwise. */
-    static bool startMachine(const QUuid &uID);
+    /** Static factory to start machine. */
+    static bool startMachine();
     /** Static constructor. */
     static bool create();