Changeset 78374 in vbox for trunk/src

Timestamp:

May 3, 2019 11:41:50 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8400. Reataching the medium to the vms after a medium type change.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumItem.cpp (modified) (2 diffs)
• UIMediumItem.h (modified) (3 diffs)
• UIMediumManager.cpp (modified) (1 diff)

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

@@ -197 +197 @@
         return false;
    return medium().curStateMachineIds().contains(uId);
+}
+
+bool UIMediumItem::changeMediumType(KMediumType enmOldType, KMediumType enmNewType)
+{
+    QList<AttachmentCache> attachmentCacheList;
+    /* Cache the list of vms the medium is attached to. We will need this for the re-attachment: */
+    foreach (const QUuid &uMachineId, medium().curStateMachineIds())
+    {
+        const CMachine &comMachine = vboxGlobal().virtualBox().FindMachine(uMachineId.toString());
+        if (comMachine.isNull())
+            continue;
+        CMediumAttachmentVector attachments = comMachine.GetMediumAttachments();
+        foreach (const CMediumAttachment &attachment, attachments)
+        {
+            const CMedium& comMedium = attachment.GetMedium();
+            if (comMedium.isNull() || comMedium.GetId() != id())
+                continue;
+            AttachmentCache attachmentCache;
+            attachmentCache.m_uMachineId = uMachineId;
+            attachmentCache.m_strControllerName = attachment.GetController();
+            attachmentCache.m_port = attachment.GetPort();
+            attachmentCache.m_device = attachment.GetDevice();
+            attachmentCacheList << attachmentCache;
+        }
+    }
+
+    /* Detach the medium from all the vms it is already attached to: */
+    if (!release(true))
+        return false;
+
+    /* Search for corresponding medium: */
+    CMedium comMedium = vboxGlobal().medium(id()).medium();
+
+    /* Attempt to change medium type: */
+    comMedium.SetType(enmNewType);
+
+    /* Show error message if necessary: */
+    if (!comMedium.isOk() && parentTree())
+    {
+        msgCenter().cannotChangeMediumType(comMedium, enmOldType, enmNewType, treeWidget());
+        return false;
+    }
+    /* Reattach the medium to all the vms it was previously attached: */
+    foreach (const AttachmentCache &attachmentCache, attachmentCacheList)
+        attachTo(attachmentCache);
+    return true;
 }
 
@@ -302 +348 @@
 }
 
+bool UIMediumItem::attachTo(const AttachmentCache &attachmentCache)
+{
+    CMedium comMedium = medium().medium();
+
+    if (comMedium.isNull())
+        return false;
+
+    /* Open session: */
+    CSession session = vboxGlobal().openSession(attachmentCache.m_uMachineId);
+    if (session.isNull())
+        return false;
+
+    /* Get machine: */
+    CMachine machine = session.GetMachine();
+
+    bool fSuccess = false;
+    machine.AttachDevice(attachmentCache.m_strControllerName, attachmentCache.m_port,
+                         attachmentCache.m_device, comMedium.GetDeviceType(), comMedium);
+
+    if (machine.isOk())
+    {
+        machine.SaveSettings();
+        if (!machine.isOk())
+            msgCenter().cannotSaveMachineSettings(machine, treeWidget());
+        else
+            fSuccess = true;
+    }
+
+    /* Close session: */
+    session.UnlockMachine();
+
+    /* Return result: */
+    return fSuccess;
+}
+
 /* static */
 QString UIMediumItem::formatFieldText(const QString &strText, bool fCompact /* = true */,

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.h

@@ -110 +110 @@
     /** Returns true if the medium is attached to the vm with @p uId. */
     bool isMediumAttachedTo(QUuid uId);
+    bool changeMediumType(KMediumType enmOldType, KMediumType enmNewType);
 
 protected:
@@ -120 +121 @@
 
 private:
+    /** A simple struct used to save some parameters of machine device attachment.
+      * Used for re-attaching the medium to vms after a medium type change. */
+    struct AttachmentCache
+    {
+        QString m_strControllerName;
+        QUuid   m_uMachineId;
+        LONG    m_port;
+        LONG    m_device;
+    };
 
     /** Refreshes item information such as icon, text and tool-tip. */
@@ -126 +136 @@
     /** Releases UIMedium wrapped by <i>this</i> item from virtual machine with @a uMachineId. */
     bool releaseFrom(const QUuid &uMachineId);
+    /** Is called by detaching the medium and modifiying it to restore the attachement. */
+    bool attachTo(const AttachmentCache &attachmentCache);
 
     /** Formats field text. */

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

@@ -274 +274 @@
         && newData.m_options.m_enmMediumType != oldData.m_options.m_enmMediumType)
     {
-        /* Check if we need to release medium first: */
-        bool fDo = true;
-        if (   pMediumItem->machineIds().size() > 1
-            || (   (   newData.m_options.m_enmMediumType == KMediumType_Immutable
-                    || newData.m_options.m_enmMediumType == KMediumType_MultiAttach)
-                && pMediumItem->machineIds().size() > 0))
-            fDo = pMediumItem->release(true);
-
-        if (fDo)
-        {
-            comMedium.SetType(newData.m_options.m_enmMediumType);
-
-            /* Show error message if necessary: */
-            if (!comMedium.isOk())
-                msgCenter().cannotChangeMediumType(comMedium, oldData.m_options.m_enmMediumType, newData.m_options.m_enmMediumType, this);
-        }
+        pMediumItem->changeMediumType(oldData.m_options.m_enmMediumType, newData.m_options.m_enmMediumType);
     }