Changeset 79889 in vbox

Timestamp:

Jul 19, 2019 3:45:15 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132293

Message:

FE/Qt: bugref:7720: Extend UICommon with API which automatically detects which type of session needs to be opened for passed VM if any at all.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICommon.cpp (modified) (2 diffs)
• UICommon.h (modified) (1 diff)

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

@@ -2493 +2493 @@
 }
 
+CSession UICommon::tryToOpenSessionFor(CMachine &comMachine)
+{
+    /* Prepare session: */
+    CSession comSession;
+
+    /* Session state unlocked? */
+    if (comMachine.GetSessionState() == KSessionState_Unlocked)
+    {
+        /* Open own 'write' session: */
+        comSession = openSession(comMachine.GetId());
+        AssertReturn(!comSession.isNull(), CSession());
+        comMachine = comSession.GetMachine();
+    }
+    /* Is this a Selector UI call? */
+    else if (uiType() == UIType_SelectorUI)
+    {
+        /* Open existing 'shared' session: */
+        comSession = openExistingSession(comMachine.GetId());
+        AssertReturn(!comSession.isNull(), CSession());
+        comMachine = comSession.GetMachine();
+    }
+    /* Else this is Runtime UI call
+     * which has session locked for itself. */
+
+    /* Return session: */
+    return comSession;
+}
+
 void UICommon::startMediumEnumeration(const CMediumVector &comMedia /* = CMediumVector() */)
 {
@@ -3244 +3272 @@
         return;
 
-    /* Get editable machine: */
-    CSession comSession;
+    /* Get editable machine & session: */
     CMachine comMachine = comConstMachine;
-    KSessionState enmSessionState = comMachine.GetSessionState();
-    /* Session state unlocked? */
-    if (enmSessionState == KSessionState_Unlocked)
-    {
-        /* Open own 'write' session: */
-        comSession = openSession(comMachine.GetId());
-        AssertReturnVoid(!comSession.isNull());
-        comMachine = comSession.GetMachine();
-    }
-    /* Is this a Selector UI call? */
-    else if (uiType() == UIType_SelectorUI)
-    {
-        /* Open existing 'shared' session: */
-        comSession = openExistingSession(comMachine.GetId());
-        AssertReturnVoid(!comSession.isNull());
-        comMachine = comSession.GetMachine();
-    }
-    /* Else this is Runtime UI call
-     * which has session locked for itself. */
+    CSession comSession = tryToOpenSessionFor(comMachine);
 
     /* Remount medium to the predefined port/device: */

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

@@ -472 +472 @@
         /** Opens session of KLockType_Shared type for VM with certain @a uId. */
         CSession openExistingSession(const QUuid &uId) { return openSession(uId, KLockType_Shared); }
+        /** Tries to guess if new @a comSession needs to be opened for certain @a comMachine,
+          * if yes, new session of required type will be opened and machine will be updated,
+          * otherwise, no session will be created and machine will be left unchanged. */
+        CSession tryToOpenSessionFor(CMachine &comMachine);
     /** @} */