Changeset 78542 in vbox for trunk/src/VBox

Timestamp:

May 16, 2019 11:00:44 AM (6 years ago)

Author:

vboxsync

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

130588

Message:

FE/Qt: bugref:6247: VM Settings / Storage page: Make sure there is no excessive devices left for controller when bus type is changed to one with smaller amount of supported devices.

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) (1 diff)

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

@@ -1123 +1123 @@
                              "change to type which doesn't support optical devices.</p><p>If you proceed optical "
                              "devices will be removed.</p>"));
+}
+
+bool UIMessageCenter::confirmStorageBusChangeWithExcessiveRemoval(QWidget *pParent /* = 0 */) const
+{
+    return questionBinary(pParent, MessageType_Question,
+                          tr("<p>This controller has devices attached.  You have requested storage bus change to "
+                             "type which supports smaller amount of attached devices.</p><p>If you proceed "
+                             "excessive devices will be removed.</p>"));
 }
 

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

@@ -320 +320 @@
     int confirmRemovingOfLastDVDDevice(QWidget *pParent = 0) const;
     bool confirmStorageBusChangeWithOpticalRemoval(QWidget *pParent = 0) const;
+    bool confirmStorageBusChangeWithExcessiveRemoval(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

@@ -1715 +1715 @@
                     }
 
+                    /* Lets make sure there is enough of place for all the remaining attachments: */
+                    const uint uMaxPortCount =
+                        (uint)vboxGlobal().virtualBox().GetSystemProperties().GetMaxPortCountForStorageBus(enmNewCtrBusType);
+                    const uint uMaxDevicePerPortCount =
+                        (uint)vboxGlobal().virtualBox().GetSystemProperties().GetMaxDevicesPerPortForStorageBus(enmNewCtrBusType);
+                    const QList<QUuid> ids = pItemController->attachmentIDs();
+                    if (uMaxPortCount * uMaxDevicePerPortCount < (uint)ids.size())
+                    {
+                        if (!msgCenter().confirmStorageBusChangeWithExcessiveRemoval())
+                            return false;
+                        for (int i = uMaxPortCount * uMaxDevicePerPortCount; i < ids.size(); ++i)
+                            delAttachment(pItemController->id(), ids.at(i));
+                    }
+
                     pItemController->setCtrBusType(enmNewCtrBusType);
                     emit dataChanged(aIndex, aIndex);