Changeset 73944 in vbox

Timestamp:

Aug 29, 2018 12:15:37 PM (7 years ago)

Author:

vboxsync

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

124671

Message:

FE/Qt: bugref:8472. Enumerate only machine media instead of all known media during a vm start

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (2 diffs)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (3 diffs)

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

@@ -213 +213 @@
     /* Cache medium data early if necessary: */
     if (vboxGlobal().agressiveCaching())
-        vboxGlobal().startMediumEnumeration();
-
+    {
+        AssertReturn(!m_pSession, false);
+        vboxGlobal().startMediumEnumeration(m_pSession->getMachineMedia());
+    }
     /* Prepare machine-logic: */
     prepareMachineLogic();
@@ -316 +318 @@
     sltChangeVisualState(m_initialVisualState);
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp ¶

@@ -2119 +2119 @@
 }
 
+CMediumVector UISession::getMachineMedia() const
+{
+    CMediumVector media;
+    foreach (const CStorageController &controller, m_machine.GetStorageControllers())
+    {
+        QString strAttData;
+        /* Enumerate all the attachments: */
+        foreach (const CMediumAttachment &attachment, m_machine.GetMediumAttachmentsOfController(controller.GetName()))
+        {
+            /* Skip unrelated attachments: */
+            if (attachment.GetType() != KDeviceType_HardDisk &&
+                attachment.GetType() != KDeviceType_Floppy &&
+                attachment.GetType() != KDeviceType_DVD)
+                continue;
+            if (attachment.GetIsEjected() || attachment.GetMedium().isNull())
+                continue;
+            media.append(attachment.GetMedium());
+        }
+    }
+    return media;
+}
+
 void UISession::loadVMSettings()
 {
@@ -2270 +2292 @@
 }
 #endif /* VBOX_GUI_WITH_KEYS_RESET_HANDLER */
-

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h ¶

@@ -39 +39 @@
 #include "CKeyboard.h"
 #include "CMachineDebugger.h"
+#include "CMedium.h"
 
 /* Forward declarations: */
@@ -279 +280 @@
     /** Returns the list of visible guest windows. */
     QList<int> listOfVisibleWindows() const;
+
+    /** Returns a vector of media attached to the machine. */
+    CMediumVector getMachineMedia() const;
 
 signals:
@@ -559 +563 @@
 
 #endif /* !___UISession_h___ */
-