Changeset 79044 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 7, 2019 4:36:53 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7127: Update parseAttachment worker with workaround to process previously mounted medium.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (2 diffs)
• medium/UIMediumEnumerator.cpp (modified) (2 diffs)

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

@@ -590 +590 @@
           tr("Encryption password for <nobr>ID = '%1'</nobr> is invalid.")
              .arg(strPasswordId));
+}
+
+void UIMessageCenter::cannotAcquireMachineParameter(const CMachine &comMachine, QWidget *pParent /* = 0 */) const
+{
+    /* Show the error: */
+    error(pParent, MessageType_Error,
+          tr("Failed to acquire machine parameter."), UIErrorString::formatErrorInfo(comMachine));
 }
 
@@ -1490 +1497 @@
 }
 
-void UIMessageCenter::cannotAcquireAttachmentMedium(const CMediumAttachment &comAttachment, QWidget *pParent /* = 0 */) const
+void UIMessageCenter::cannotAcquireAttachmentParameter(const CMediumAttachment &comAttachment, QWidget *pParent /* = 0 */) const
 {
     /* Show the error: */
     error(pParent, MessageType_Error,
-          tr("Failed to acquire attachment medium."), UIErrorString::formatErrorInfo(comAttachment));
+          tr("Failed to acquire attachment parameter."), UIErrorString::formatErrorInfo(comAttachment));
 }
 

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

@@ -263 +263 @@
     void cannotSetExtraData(const CMachine &machine, const QString &strKey, const QString &strValue);
     void warnAboutInvalidEncryptionPassword(const QString &strPasswordId, QWidget *pParent = 0);
+    void cannotAcquireMachineParameter(const CMachine &comMachine, QWidget *pParent = 0) const;
 
     /* API: Selector warnings: */
@@ -346 +347 @@
     void cannotOpenMedium(const CVirtualBox &comVBox, const QString &strLocation, QWidget *pParent = 0) const;
     void cannotOpenKnownMedium(const CVirtualBox &comVBox, const QUuid &uMediumId, QWidget *pParent = 0) const;
-    void cannotAcquireAttachmentMedium(const CMediumAttachment &comAttachment, QWidget *pParent = 0) const;
+    void cannotAcquireAttachmentParameter(const CMediumAttachment &comAttachment, QWidget *pParent = 0) const;
     void cannotAcquireMediumAttribute(const CMedium &comMedium, QWidget *pParent = 0) const;
     void cannotCloseMedium(const UIMedium &medium, const COMResult &rc, QWidget *pParent = 0) const;

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -776 +776 @@
         {
             LogRel2(("GUI: UIMediumEnumerator:  Unable to acquire attachment medium!\n"));
-            msgCenter().cannotAcquireAttachmentMedium(comAttachment);
+            msgCenter().cannotAcquireAttachmentParameter(comAttachment);
         }
         else
@@ -782 +782 @@
             /* Parse medium: */
             result << parseMedium(comMedium);
+
+            // WORKAROUND:
+            // In current architecture there is no way to determine medium previously mounted
+            // to this attachment, so we will have to enumerate all other cached media which
+            // belongs to the same VM, since they may no longer belong to it.
+
+            /* Acquire parent VM: */
+            CMachine comMachine = comAttachment.GetMachine();
+            if (!comAttachment.isOk())
+            {
+                LogRel2(("GUI: UIMediumEnumerator:  Unable to acquire attachment parent machine!\n"));
+                msgCenter().cannotAcquireAttachmentParameter(comAttachment);
+            }
+            else
+            {
+                /* Acquire machine ID: */
+                const QUuid uMachineId = comMachine.GetId();
+                if (!comMachine.isOk())
+                {
+                    LogRel2(("GUI: UIMediumEnumerator:  Unable to acquire machine ID!\n"));
+                    msgCenter().cannotAcquireMachineParameter(comMachine);
+                }
+                else
+                {
+                    /* For each the cached UIMedium we have: */
+                    foreach (const QUuid &uMediumId, mediumIDs())
+                    {
+                        const UIMedium guiMedium = medium(uMediumId);
+                        if (   !guiMedium.isNull()
+                            && guiMedium.machineIds().contains(uMachineId)
+                            && !result.contains(uMediumId))
+                        {
+                            /* Enumerate corresponding UIMedium: */
+                            LogRel2(("GUI: UIMediumEnumerator:  Medium {%s} will be enumerated..\n",
+                                     uMediumId.toString().toUtf8().constData()));
+                            createMediumEnumerationTask(guiMedium);
+                            result << uMediumId;
+                        }
+                    }
+                }
+            }
         }
     }