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

Timestamp:

Dec 28, 2009 9:40:51 PM (15 years ago)

Author:

vboxsync

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

56277

Message:

LsiLogic: Add SAS support for Main and Frontends

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (4 diffs)
• settings/vm/VBoxVMSettingsHD.cpp (modified) (11 diffs)
• settings/vm/VBoxVMSettingsHD.h (modified) (4 diffs)

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

@@ -1175 +1175 @@
         case KStorageBus_SCSI:
         case KStorageBus_Floppy:
+        case KStorageBus_SAS:
             break;
 
@@ -1212 +1213 @@
         {
             result = mSlotTemplates [6].arg (aSlot.device);
+            break;
+        }
+        case KStorageBus_SAS:
+        {
+            result = mSlotTemplates [5].arg (aSlot.port);
             break;
         }
@@ -2700 +2706 @@
     mStorageBuses [KStorageBus_SCSI] =      tr ("SCSI", "StorageBus");
     mStorageBuses [KStorageBus_Floppy] =    tr ("Floppy", "StorageBus");
+    mStorageBuses [KStorageBus_SAS] =      tr ("SAS", "StorageBus");
 
     mStorageBusChannels [0] = tr ("Primary", "StorageBusChannel");
@@ -2807 +2814 @@
     mStorageControllerTypes [KStorageControllerType_I82078] =
         tr ("I82078", "StorageControllerType");
+    mStorageControllerTypes [KStorageControllerType_LsiLogicSas] =
+        tr ("LsiLogic SAS", "StorageControllerType");
 
     mUSBDeviceStates [KUSBDeviceState_NotSupported] =

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.cpp

@@ -170 +170 @@
                 mPixmaps [i] = (PixmapPool::PixmapType) (PixmapPool::FloppyControllerNormal + i);
                 break;
+            case KStorageBus_SAS:
+                mPixmaps [i] = (PixmapPool::PixmapType) (PixmapPool::SATAControllerNormal + i);
+                break;
             default:
                 break;
@@ -270 +273 @@
 
 uint FloppyControllerType::size() const
+{
+    return 1;
+}
+
+/* SAS Controller Type */
+SASControllerType::SASControllerType (KStorageControllerType aSubType)
+    : AbstractControllerType (KStorageBus_SAS, aSubType)
+{
+}
+
+KStorageControllerType SASControllerType::first() const
+{
+    return KStorageControllerType_LsiLogicSas;
+}
+
+uint SASControllerType::size() const
 {
     return 1;
@@ -408 +427 @@
         case KStorageBus_Floppy:
             mCtrType = new FloppyControllerType (aControllerType);
+            break;
+        case KStorageBus_SAS:
+            mCtrType = new SASControllerType (aControllerType);
             break;
         default:
@@ -1022 +1044 @@
             return static_cast <RootItem*> (mRootItem)->childCount (KStorageBus_Floppy) <
                    vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (KStorageBus_Floppy);
+        }
+        case R_IsMoreSASControllersPossible:
+        {
+            return static_cast <RootItem*> (mRootItem)->childCount (KStorageBus_SAS) <
+                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (KStorageBus_SAS);
         }
         case R_IsMoreAttachmentsPossible:
@@ -1542 +1569 @@
                                                        PixmapPool::pool()->pixmap (PixmapPool::FloppyControllerAddDis)));
 
+    mAddSASCtrAction = new QAction (this);
+    mAddSASCtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::SATAControllerAddEn),
+                                                    PixmapPool::pool()->pixmap (PixmapPool::SATAControllerAddDis)));
+
     mDelCtrAction = new QAction (this);
     mDelCtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::ControllerDelEn),
@@ -1617 +1648 @@
     connect (mAddSATACtrAction, SIGNAL (triggered (bool)), this, SLOT (addSATAController()));
     connect (mAddSCSICtrAction, SIGNAL (triggered (bool)), this, SLOT (addSCSIController()));
+    connect (mAddSASCtrAction, SIGNAL (triggered (bool)), this, SLOT (addSASController()));
     connect (mAddFloppyCtrAction, SIGNAL (triggered (bool)), this, SLOT (addFloppyController()));
     connect (mDelCtrAction, SIGNAL (triggered (bool)), this, SLOT (delController()));
@@ -1792 +1824 @@
     mAddSATACtrAction->setText (tr ("Add SATA Controller"));
     mAddSCSICtrAction->setText (tr ("Add SCSI Controller"));
+    mAddSASCtrAction->setText (tr ("Add SAS Controller"));
     mAddFloppyCtrAction->setText (tr ("Add Floppy Controller"));
     mDelCtrAction->setText (tr ("Remove Controller"));
@@ -1893 +1926 @@
     menu.addAction (mAddSATACtrAction);
     menu.addAction (mAddSCSICtrAction);
+    menu.addAction (mAddSASCtrAction);
     menu.addAction (mAddFloppyCtrAction);
     menu.exec (QCursor::pos());
@@ -1915 +1949 @@
 {
     addControllerWrapper (generateUniqueName (tr ("Floppy Controller")), KStorageBus_Floppy, KStorageControllerType_I82078);
+}
+
+void VBoxVMSettingsHD::addSASController()
+{
+    addControllerWrapper (generateUniqueName (tr ("SAS Controller")), KStorageBus_SAS, KStorageControllerType_LsiLogicSas);
 }
 
@@ -2167 +2206 @@
     bool isSCSIPossible = mStorageModel->data (index, StorageModel::R_IsMoreSCSIControllersPossible).toBool();
     bool isFloppyPossible = mStorageModel->data (index, StorageModel::R_IsMoreFloppyControllersPossible).toBool();
+    bool isSASPossible = mStorageModel->data (index, StorageModel::R_IsMoreSASControllersPossible).toBool();
 
     bool isController = mStorageModel->data (index, StorageModel::R_IsController).toBool();
@@ -2177 +2217 @@
     mAddSCSICtrAction->setEnabled (isSCSIPossible);
     mAddFloppyCtrAction->setEnabled (isFloppyPossible);
+    mAddSASCtrAction->setEnabled (isSASPossible);
 
     mAddAttAction->setEnabled (isController && isAttachmentsPossible);

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.h

@@ -207 +207 @@
 };
 
+/* SAS Controller Type */
+class SASControllerType : public AbstractControllerType
+{
+public:
+
+    SASControllerType (KStorageControllerType aSubType);
+
+private:
+
+    KStorageControllerType first() const;
+    uint size() const;
+};
+
 /* Abstract Item */
 class AbstractItem
@@ -402 +415 @@
         R_IsMoreSCSIControllersPossible,
         R_IsMoreFloppyControllersPossible,
+        R_IsMoreSASControllersPossible,
         R_IsMoreAttachmentsPossible,
 
@@ -543 +557 @@
     void addSCSIController();
     void addFloppyController();
+    void addSASController();
     void delController();
 
@@ -593 +608 @@
     QAction *mAddSATACtrAction;
     QAction *mAddSCSICtrAction;
+    QAction *mAddSASCtrAction;
     QAction *mAddFloppyCtrAction;
     QAction *mDelCtrAction;