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

Timestamp:

Oct 8, 2013 10:38:17 PM (12 years ago)

Author:

vboxsync

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

89702

Message:

Main, Frontends: Make the port count of the SAS controller configurable and support up to 255 storage devices

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsStorage.cpp (modified) (5 diffs)
• UIMachineSettingsStorage.h (modified) (2 diffs)

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

@@ -485 +485 @@
     }
     return mPortCount;
+}
+
+uint ControllerItem::maxPortCount()
+{
+    return (uint)vboxGlobal().virtualBox().GetSystemProperties().GetMaxPortCountForStorageBus(ctrBusType());
 }
 
@@ -1107 +1112 @@
                 if (item->rtti() == AbstractItem::Type_ControllerItem)
                     return static_cast <ControllerItem*> (item)->portCount();
+            return 0;
+        }
+        case R_CtrMaxPortCount:
+        {
+            if (AbstractItem *item = static_cast <AbstractItem*> (aIndex.internalPointer()))
+                if (item->rtti() == AbstractItem::Type_ControllerItem)
+                    return static_cast <ControllerItem*> (item)->maxPortCount();
             return 0;
         }
@@ -2515 +2527 @@
 
                 KStorageBus bus = mStorageModel->data (index, StorageModel::R_CtrBusType).value <KStorageBus>();
-                mLbPortCount->setVisible (bus == KStorageBus_SATA);
-                mSbPortCount->setVisible (bus == KStorageBus_SATA);
+                mLbPortCount->setVisible (bus == KStorageBus_SATA || bus == KStorageBus_SAS);
+                mSbPortCount->setVisible (bus == KStorageBus_SATA || bus == KStorageBus_SAS);
                 uint uPortCount = mStorageModel->data (index, StorageModel::R_CtrPortCount).toUInt();
+                uint uMaxPortCount = mStorageModel->data (index, StorageModel::R_CtrMaxPortCount).toUInt();
+                mSbPortCount->setMaximum(uMaxPortCount);
                 mSbPortCount->setValue (uPortCount);
 
@@ -3406 +3420 @@
                 controller.SetControllerType(controllerType);
                 controller.SetUseHostIOCache(fUseHostIOCache);
-                if (controllerBus == KStorageBus_SATA)
+                if (controllerBus == KStorageBus_SATA || controllerBus == KStorageBus_SAS)
                 {
                     uPortCount = qMax(uPortCount, controller.GetMinPortCount());
@@ -3455 +3469 @@
             controller.SetControllerType(controllerType);
             controller.SetUseHostIOCache(fUseHostIOCache);
-            if (controllerBus == KStorageBus_SATA)
+            if (controllerBus == KStorageBus_SATA || controllerBus == KStorageBus_SAS)
             {
                 uPortCount = qMax(uPortCount, controller.GetMinPortCount());

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

@@ -324 +324 @@
     ControllerTypeList ctrTypes() const;
     uint portCount();
+    uint maxPortCount();
     bool ctrUseIoCache() const;
 
@@ -458 +459 @@
         R_CtrBusType,
         R_CtrPortCount,
+        R_CtrMaxPortCount,
         R_CtrIoCache,