Changeset 63747 in vbox

Timestamp:

Sep 7, 2016 12:00:41 PM (8 years ago)

Author:

vboxsync

Message:

Main/ConsoleImpl: Fix config for multiple NVMe controllers if ICH9 is used

Location:

trunk/src/VBox/Main/src-client

Files:

• BusAssignmentManager.cpp (modified) (2 diffs)
• ConsoleImpl2.cpp (modified) (1 diff)

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

@@ -167 +167 @@
     {"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 */
@@ -205 +198 @@
     {"nic",           2, 31, 0,   0},
 
+    /* Storage controller #2 (NVMe) */
+    {"nvme",          3,  0, 0,   0},
+    {"nvme",          3,  1, 0,   0},
+    {"nvme",          3,  2, 0,   0},
+    {"nvme",          3,  3, 0,   0},
+    {"nvme",          3,  4, 0,   0},
+    {"nvme",          3,  5, 0,   0},
+    {"nvme",          3,  6, 0,   0},
+
     { NULL,          -1, -1, -1,  0}
 };

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

@@ -2339 +2339 @@
                     hrc = ctrls[i]->COMGETTER(PortCount)(&cPorts);                          H();
                     InsertConfigInteger(pCfg, "NamespacesMax", cPorts);
+
+                    /* For ICH9 we need to create a new PCI bridge if there is more than one NVMe instance. */
+                    if (   ulInstance > 0
+                        && chipsetType == ChipsetType_ICH9
+                        && !pBusMgr->hasPCIDevice("ich9pcibridge", 2))
+                    {
+                        PCFGMNODE pBridges = CFGMR3GetChild(pDevices, "ich9pcibridge");
+                        Assert(pBridges);
+
+                        InsertConfigNode(pBridges, "2", &pInst);
+                        InsertConfigInteger(pInst, "Trusted",              1);
+                        hrc = pBusMgr->assignPCIDevice("ich9pcibridge", pInst);
+                    }
 
                     /* Attach the status driver */