Changeset 78539 in vbox for trunk/src/VBox

Timestamp:

May 16, 2019 9:42:39 AM (6 years ago)

Author:

vboxsync

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

130584

Message:

FE/Qt: bugref:6247: VM Settings / Storage page: Make sure there is no optical devices left for controller when bus type is changed to NVMe.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsStorage.h (modified) (1 diff)

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

@@ -1115 +1115 @@
                           QString() /* cancel button text */,
                           false /* ok button by default? */);
+}
+
+bool UIMessageCenter::confirmStorageBusChangeWithOpticalRemoval(QWidget *pParent /* = 0 */) const
+{
+    return questionBinary(pParent, MessageType_Question,
+                          tr("<p>This controller has optical devices attached.  You have requested storage bus "
+                             "change to type which doesn't support optical devices.</p><p>If you proceed optical "
+                             "devices will be removed.</p>"));
 }
 

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

@@ -319 +319 @@
     bool confirmSettingsReloading(QWidget *pParent = 0) const;
     int confirmRemovingOfLastDVDDevice(QWidget *pParent = 0) const;
+    bool confirmStorageBusChangeWithOpticalRemoval(QWidget *pParent = 0) const;
     void cannotAttachDevice(const CMachine &machine, UIMediumDeviceType type, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent = 0);
     bool warnAboutIncorrectPort(QWidget *pParent = 0) const;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -805 +805 @@
 }
 
+QList<QUuid> ControllerItem::attachmentIDs(KDeviceType enmType /* = KDeviceType_Null */) const
+{
+    QList<QUuid> ids;
+    foreach (AbstractItem *pItem, mAttachments)
+    {
+        AttachmentItem *pItemAttachment = static_cast<AttachmentItem*>(pItem);
+        if (   enmType == KDeviceType_Null
+            || pItemAttachment->attDeviceType() == enmType)
+            ids << pItem->id();
+    }
+    return ids;
+}
+
 AbstractItem::ItemType ControllerItem::rtti() const
 {
@@ -1687 +1700 @@
                     ControllerItem *pItemController = static_cast<ControllerItem*>(pItem);
                     const KStorageBus enmNewCtrBusType = aValue.value<KStorageBus>();
+
+                    /* PCIe devices allows for hard-drives attachments only,
+                     * no optical devices. So, lets make sure that rule is fulfilled. */
+                    if (enmNewCtrBusType == KStorageBus_PCIe)
+                    {
+                        const QList<QUuid> opticalIds = pItemController->attachmentIDs(KDeviceType_DVD);
+                        if (!opticalIds.isEmpty())
+                        {
+                            if (!msgCenter().confirmStorageBusChangeWithOpticalRemoval())
+                                return false;
+                            foreach (const QUuid &uId, opticalIds)
+                                delAttachment(pItemController->id(), uId);
+                        }
+                    }
+
                     pItemController->setCtrBusType(enmNewCtrBusType);
                     emit dataChanged(aIndex, aIndex);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -278 +278 @@
     SlotsList ctrUsedSlots() const;
     DeviceTypeList ctrDeviceTypeList() const;
+
+    QList<QUuid> attachmentIDs(KDeviceType enmType = KDeviceType_Null) const;
 
     void setAttachments(const QList<AbstractItem*> &attachments) { mAttachments = attachments; }