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

Timestamp:

Nov 21, 2024 3:44:25 PM (3 months ago)

Author:

vboxsync

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

166048

Message:

FE/Qt: bugref:10802. Don't use hard coded port numbers during medium attachmnet. The new code searches for unused ports and failing that it increases port count.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (3 diffs)
• wizards/newvm/UIWizardNewVM.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -693 +693 @@
         QApplication::translate("UIMessageCenter", "Storage controller failure ..."),
         QApplication::translate("UIMessageCenter", "Failed to acquire storage controller parameter.") +
+        UIErrorString::formatErrorInfo(comStorageController));
+}
+
+/* static */
+void UINotificationMessage::cannotChangeStorageControllerParameter(const CStorageController &comStorageController)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Storage controller failure ..."),
+        QApplication::translate("UIMessageCenter", "Failed to change storage controller parameter.") +
         UIErrorString::formatErrorInfo(comStorageController));
 }

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -307 +307 @@
           * @param  comStorageController  Brings the object parameter get acquired from. */
         static void cannotAcquireStorageControllerParameter(const CStorageController &comStorageController);
+        /** Notifies about inability to change IStorageController parameter.
+          * @param  comStorageController  Brings the object parameter being changed for. */
+        static void cannotChangeStorageControllerParameter(const CStorageController &comStorageController);
         /** Notifies about inability to acquire IMediumAttachment parameter.
           * @param  comMediumAttachment  Brings the object parameter get acquired from. */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -284 +284 @@
         {
             KStorageBus enmHDDBus = gpGlobalSession->guestOSTypeManager().getRecommendedHDStorageBus(m_guestOSTypeId);
-            CStorageController comHDDController = m_machine.GetStorageControllerByInstance(enmHDDBus, 0);
+            CStorageController comHDDController = machine.GetStorageControllerByInstance(enmHDDBus, 0);
             if (!comHDDController.isNull())
             {
-                machine.AttachDevice(comHDDController.GetName(), 0, 0, KDeviceType_HardDisk, m_virtualDisk);
+                LONG uPortNumber = portNumberForDevice(comHDDController);
+                machine.AttachDevice(comHDDController.GetName(), uPortNumber, 0, KDeviceType_HardDisk, m_virtualDisk);
                 if (!machine.isOk())
                     UINotificationMessage::cannotAttachDevice(machine, UIMediumDeviceType_HardDisk, m_strMediumPath,
-                                                              StorageSlot(enmHDDBus, 0, 0), notificationCenter());
+                                                              StorageSlot(enmHDDBus, uPortNumber, 0), notificationCenter());
             }
+        }
+        /* Save machine settings here because  portNumberForDevice needs to inquiry port attachments of the controller: */
+        if (machine.isOk())
+        {
+            machine.SaveSettings();
+            if (machine.isOk())
+                success = true;
+            else
+                UINotificationMessage::cannotSaveMachineSettings(machine, notificationCenter());
         }
 
         /* Attach optical drive: */
         KStorageBus enmDVDBus = gpGlobalSession->guestOSTypeManager().getRecommendedDVDStorageBus(m_guestOSTypeId);
-        CStorageController comDVDController = m_machine.GetStorageControllerByInstance(enmDVDBus, 0);
+        CStorageController comDVDController = machine.GetStorageControllerByInstance(enmDVDBus, 0);
         if (!comDVDController.isNull())
         {
@@ -309 +319 @@
                     UINotificationMessage::cannotOpenMedium(vbox, strISOFilePath, notificationCenter());
             }
-            machine.AttachDevice(comDVDController.GetName(), 1, 0, KDeviceType_DVD, opticalDisk);
+            LONG uPortNumber = portNumberForDevice(comDVDController);
+            machine.AttachDevice(comDVDController.GetName(), uPortNumber, 0, KDeviceType_DVD, opticalDisk);
             if (!machine.isOk())
                 UINotificationMessage::cannotAttachDevice(machine, UIMediumDeviceType_DVD, QString(),
                                                           StorageSlot(enmDVDBus, 1, 0), notificationCenter());
         }
+        /* Save machine settings here because  portNumberForDevice needs to inquiry port attachments of the controller: */
+        if (machine.isOk())
+        {
+            machine.SaveSettings();
+            if (machine.isOk())
+                success = true;
+            else
+                UINotificationMessage::cannotSaveMachineSettings(machine, notificationCenter());
+        }
 
         /* Attach an empty floppy drive if recommended */
         if (gpGlobalSession->guestOSTypeManager().getRecommendedFloppy(m_guestOSTypeId))
         {
-            CStorageController comFloppyController = m_machine.GetStorageControllerByInstance(KStorageBus_Floppy, 0);
+            CStorageController comFloppyController = machine.GetStorageControllerByInstance(KStorageBus_Floppy, 0);
             if (!comFloppyController.isNull())
             {
@@ -830 +850 @@
     return true;
 }
+
+LONG UIWizardNewVM::portNumberForDevice(CStorageController &comController)
+{
+    QVector<CMediumAttachment> attachments = m_machine.GetMediumAttachmentsOfController(comController.GetName());
+    QVector<LONG> attachmentPorts(attachments.size(), -1);
+    for (int i = 0; i < attachmentPorts.size(); ++i)
+        attachmentPorts[i] = attachments[i].GetPort();
+    LONG portCount = comController.GetPortCount();
+    /* Check if any of the ports in range [0, portCount) is unused. If so return it: */
+    for (int i = 0; i < portCount; ++i)
+    {
+        if (!attachmentPorts.contains(i))
+            return i;
+    }
+
+
+    if (!comController.isOk())
+    {
+        UINotificationMessage::cannotAcquireStorageControllerParameter(comController);
+        return -1;
+    }
+    /* Check if we can increase the port count: */
+    if (portCount + 1 >= (LONG)comController.GetMaxPortCount())
+    {
+        UINotificationMessage::cannotChangeStorageControllerParameter(comController);
+        return -1;
+    }
+    comController.SetPortCount(portCount + 1);
+    if (!comController.isOk())
+    {
+        UINotificationMessage::cannotChangeStorageControllerParameter(comController);
+        return -1;
+    }
+    /* Use the last port: */
+    return comController.GetPortCount() - 1;
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -43 +43 @@
 /* Forward declarations: */
 class UIActionPool;
+class CStorageController;
 
 enum SelectedDiskSource
@@ -188 +189 @@
     void deleteVirtualDisk();
     bool checkUnattendedInstallError(const CUnattended &comUnattended) const;
+    LONG portNumberForDevice(CStorageController &comController);
     /** @name Variables
      * @{ */