Changeset 57524 in vbox for trunk/src/VBox

Timestamp:

Aug 25, 2015 10:20:15 AM (9 years ago)

Author:

vboxsync

Message:

Main: NVMe integration

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (5 diffs)
• include/ConsoleImpl.h (modified) (1 diff)
• src-client/BusAssignmentManager.cpp (modified) (3 diffs)
• src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• src-server/StorageControllerImpl.cpp (modified) (4 diffs)
• src-server/SystemPropertiesImpl.cpp (modified) (7 diffs)
• xml/Settings.cpp (modified) (3 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -447 +447 @@
   <enum
     name="SettingsVersion"
-    uuid="d5b15ca7-3de7-46b2-a63a-ddcce42bfa3f"
+    uuid="b4cc23c2-96f2-419d-830b-bd13c1135dfb"
     >
     <desc>
@@ -565 +565 @@
       <!--
           Machine changes: hot-plug flag for storage devices.
+      -->
+    </const>
+    <const name="v1_16" value="18">
+      <desc>Settings version "1.16", written by VirtualBox 5.1.x.</desc>
+      <!--
+          Machine changes: NVMe storage controller.
       -->
     </const>
@@ -19586 +19592 @@
   <enum
     name="StorageBus"
-    uuid="2dab9df1-9683-48fd-8c11-caada236fcb0"
+    uuid="21371490-8542-4b5a-a74d-ee9ac2d45a90"
     >
     <desc>
@@ -19601 +19607 @@
     <const name="SAS"       value="5"/>
     <const name="USB"       value="6"/>
+    <const name="PCIe"      value="7"/>
   </enum>
 
   <enum
     name="StorageControllerType"
-    uuid="02e190af-b546-4109-b036-6deaa4ef6e69"
+    uuid="9427f309-82e7-468f-9964-abfefc4d3058"
     >
     <desc>
@@ -19639 +19646 @@
       <desc>A variant of the LsiLogic controller using SAS.</desc>
     </const>
-    <const name="USB"           value="9">
+    <const name="NVMe"          value="9">
+      <desc>An NVMe storage controller.</desc>
+    </const>
+    <const name="USB"           value="10">
       <desc>Special USB based storage controller.</desc>
     </const>

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -915 +915 @@
         iLedUsb     = iLedSas + cLedSas,
         cLedUsb     = 8,
-        cLedStorage = cLedFloppy + cLedIde + cLedSata + cLedScsi + cLedSas + cLedUsb
+        iLedNvme    = iLedUsb + cLedUsb,
+        cLedNvme    = 30,
+        cLedStorage = cLedFloppy + cLedIde + cLedSata + cLedScsi + cLedSas + cLedUsb + cLedNvme
     };
     DeviceType_T maStorageDevType[cLedStorage];

trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp

@@ -68 +68 @@
     {"buslogic",      0, 21, 0,  1},
     {"lsilogicsas",   0, 22, 0,  1},
+    {"nvme",          0, 14, 0,  1},
 
     /* USB controllers */
@@ -169 +170 @@
     {"lsilogicsas",   1, 30, 0,   0},
     {"lsilogicsas",   1, 31, 0,   0},
+    {"nvme",          1, 32, 0,   0},
+    {"nvme",          1, 33, 0,   0},
+    {"nvme",          1, 34, 0,   0},
+    {"nvme",          1, 35, 0,   0},
+    {"nvme",          1, 36, 0,   0},
+    {"nvme",          1, 37, 0,   0},
+    {"nvme",          1, 38, 0,   0},
 
     /* NICs */
@@ -212 +220 @@
     {"lsilogic",    "storage"},
     {"buslogic",    "storage"},
-    {"lsilogicsas", "storage"}
+    {"lsilogicsas", "storage"},
+    {"nvme",        "storage"}
 };
 

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -2064 +2064 @@
          */
         com::SafeIfaceArray<IStorageController> ctrls;
-        PCFGMNODE aCtrlNodes[StorageControllerType_LsiLogicSas + 1] = {};
+        PCFGMNODE aCtrlNodes[StorageControllerType_NVMe + 1] = {};
         hrc = pMachine->COMGETTER(StorageControllers)(ComSafeArrayAsOutParam(ctrls));       H();
 
@@ -2280 +2280 @@
                                    "To fix this problem either enable the USB controller or remove\n"
                                    "the storage device from the VM"));
+                    break;
+                }
+
+                case StorageControllerType_NVMe:
+                {
+                    hrc = pBusMgr->assignPCIDevice("nvme", pCtlInst);                       H();
+
+                    ULONG cPorts = 0;
+                    hrc = ctrls[i]->COMGETTER(PortCount)(&cPorts);                          H();
+                    InsertConfigInteger(pCfg, "NamespacesMax", cPorts);
+
+                    /* Attach the status driver */
+                    AssertRelease(cPorts <= cLedSata);
+                    i_attachStatusDriver(pCtlInst, &mapStorageLeds[iLedNvme], 0, cPorts - 1,
+                                       &mapMediumAttachments, pszCtrlDev, ulInstance);
+                    paLedDevType = &maStorageDevType[iLedNvme];
                     break;
                 }

trunk/src/VBox/Main/src-server/StorageControllerImpl.cpp

@@ -124 +124 @@
     ComAssertRet(aParent && !aName.isEmpty(), E_INVALIDARG);
     if (   (aStorageBus <= StorageBus_Null)
-        || (aStorageBus >  StorageBus_USB))
+        || (aStorageBus >  StorageBus_PCIe))
         return setError(E_INVALIDARG,
                         tr("Invalid storage connection type"));
@@ -185 +185 @@
             m->bd->mPortCount = 8;
             m->bd->mStorageControllerType = StorageControllerType_USB;
+            break;
+        case StorageBus_PCIe:
+            m->bd->mPortCount = 1;
+            m->bd->mStorageControllerType = StorageControllerType_NVMe;
             break;
     }
@@ -425 +429 @@
             break;
         }
+        case StorageBus_PCIe:
+        {
+            if (aControllerType != StorageControllerType_NVMe)
+                rc = E_INVALIDARG;
+            break;
+        }
         default:
             AssertMsgFailed(("Invalid controller type %d\n", m->bd->mStorageBus));
@@ -560 +570 @@
             break;
         }
+        case StorageBus_PCIe:
+        {
+            /*
+             * PCIe (NVMe in particular) supports theoretically 2^32 - 1
+             * different namespaces, limit the amount artifically here.
+             */
+            if (aPortCount < 1 || aPortCount > 255)
+                return setError(E_INVALIDARG,
+                                tr("Invalid port count: %lu (must be in range [%lu, %lu])"),
+                                aPortCount, 1, 255);
+            break;
+        }
         default:
             AssertMsgFailed(("Invalid controller type %d\n", m->bd->mStorageBus));

trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp

@@ -360 +360 @@
         case StorageBus_SAS:
         case StorageBus_USB:
+        case StorageBus_PCIe:
         {
             /* SATA and both SCSI controllers only support one device per port. */
@@ -388 +389 @@
         case StorageBus_SATA:
         case StorageBus_SAS:
+        case StorageBus_PCIe:
         {
             *aMinPortCount = 1;
@@ -446 +448 @@
         }
         case StorageBus_SAS:
+        case StorageBus_PCIe:
         {
             *aMaxPortCount = 255;
@@ -474 +477 @@
         case StorageBus_SCSI:
         case StorageBus_SAS:
+        case StorageBus_PCIe:
             cCtrs = aChipset == ChipsetType_ICH9 ? 8 : 1;
             break;
@@ -517 +521 @@
             break;
         }
+        case StorageBus_PCIe:
+        {
+            aDeviceTypes.resize(1);
+            aDeviceTypes[0] = DeviceType_HardDisk;
+            break;
+        }
         default:
             AssertMsgFailed(("Invalid bus type %d\n", aBus));
@@ -535 +545 @@
         case StorageControllerType_LsiLogicSas:
         case StorageControllerType_USB:
+        case StorageControllerType_NVMe:
             *aEnabled = false;
             break;
@@ -561 +572 @@
         case StorageControllerType_LsiLogicSas:
         case StorageControllerType_BusLogic:
+        case StorageControllerType_NVMe:
         case StorageControllerType_PIIX3:
         case StorageControllerType_PIIX4:

trunk/src/VBox/Main/xml/Settings.cpp

@@ -3589 +3589 @@
             sctl.controllerType = StorageControllerType_USB;
         }
+        else if (strType == "NVMe")
+        {
+            sctl.storageBus = StorageBus_PCIe;
+            sctl.controllerType = StorageControllerType_NVMe;
+        }
         else
             throw ConfigFileError(this, pelmController, N_("Invalid value '%s' for StorageController/@type attribute"), strType.c_str());
@@ -5097 +5102 @@
             case StorageControllerType_LsiLogicSas: pcszType = "LsiLogicSas"; break;
             case StorageControllerType_USB: pcszType = "USB"; break;
+            case StorageControllerType_NVMe: pcszType = "NVMe"; break;
             default: /*case StorageControllerType_PIIX3:*/ pcszType = "PIIX3"; break;
         }
@@ -5580 +5586 @@
 void MachineConfigFile::bumpSettingsVersionIfNeeded()
 {
+    if (m->sv < SettingsVersion_v1_16)
+    {
+        // VirtualBox 5.1 adds a NVMe storage controller.
+        for (StorageControllersList::const_iterator it = storageMachine.llStorageControllers.begin();
+             it != storageMachine.llStorageControllers.end();
+             ++it)
+        {
+            const StorageController &sctl = *it;
+
+            if (sctl.controllerType == StorageControllerType_NVMe)
+            {
+                m->sv = SettingsVersion_v1_16;
+                return;
+            }
+        }
+    }
+
     if (m->sv < SettingsVersion_v1_15)
     {