Changeset 80704 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 10, 2019 3:19:39 PM (5 years ago)

Author:

vboxsync

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

133244

Message:

PDM,Devices: Changed PDM_DEVREG_FLAGS_MSI_X into a registration field giving the max MSI-X vector count config for the device (typically VBOX_MSIX_MAX_ENTRIES). bugref:9218

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/APICAll.cpp (modified) (1 diff)
• VMMR0/PDMR0Device.cpp (modified) (2 diffs)
• VMMR3/PDMDevHlp.cpp (modified) (1 diff)
• VMMR3/PDMDevice.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/APICAll.cpp

@@ -3525 +3525 @@
     /* .cbInstanceRC = */           0,
     /* .cMaxPciDevices = */         0,
+    /* .cMaxMsixVectors = */        0,
     /* .pszDescription = */         "Advanced Programmable Interrupt Controller",
 #if defined(IN_RING3)

trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp

@@ -31 +31 @@
 #include <VBox/vmm/hm.h>
 #include <VBox/vmm/vmcc.h>
+#include <VBox/vmm/gvmm.h>
 
 #include <VBox/log.h>
 #include <VBox/err.h>
-#include <VBox/vmm/gvmm.h>
+#include <VBox/msi.h>
 #include <VBox/sup.h>
 #include <iprt/asm.h>
@@ -1813 +1814 @@
         AssertLogRelMsgReturn(pDevReg->cMaxInstances   > 0, ("[%u]: %#x\n", i, pDevReg->cMaxInstances),  VERR_INVALID_PARAMETER);
         AssertLogRelMsgReturn(pDevReg->cMaxPciDevices <= 8, ("[%u]: %#x\n", i, pDevReg->cMaxPciDevices), VERR_INVALID_PARAMETER);
+        AssertLogRelMsgReturn(pDevReg->cMaxMsixVectors <= VBOX_MSIX_MAX_ENTRIES,
+                              ("[%u]: %#x\n", i, pDevReg->cMaxMsixVectors), VERR_INVALID_PARAMETER);
 
         /* The name must be printable ascii and correctly terminated. */

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -1928 +1928 @@
                           ("'%s'/%d: cMaxPciDevices is 0\n", pDevIns->pReg->szName, pDevIns->iInstance),
                           VERR_WRONG_ORDER);
-    AssertLogRelMsgReturn((pDevIns->pReg->fFlags & PDM_DEVREG_FLAGS_MSI_X) || pMsiReg->cMsixVectors == 0,
-                          ("'%s'/%d: PDM_DEVREG_FLAGS_MSI_X not set and cMsixVectors=%u\n",
-                           pDevIns->pReg->szName, pDevIns->iInstance, pMsiReg->cMsixVectors),
+    AssertLogRelMsgReturn(pMsiReg->cMsixVectors <= pDevIns->pReg->cMaxMsixVectors,
+                          ("'%s'/%d: cMsixVectors=%u cMaxMsixVectors=%u\n",
+                           pDevIns->pReg->szName, pDevIns->iInstance, pMsiReg->cMsixVectors, pDevIns->pReg->cMaxMsixVectors),
                           VERR_INVALID_FLAGS);
 

trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp

@@ -39 +39 @@
 #include <VBox/version.h>
 #include <VBox/log.h>
+#include <VBox/msi.h>
 #include <VBox/err.h>
 #include <iprt/alloc.h>
@@ -762 +763 @@
     AssertLogRelMsgReturn(pReg->cMaxPciDevices <= 8, ("%#x (szName=%s)\n", pReg->cMaxPciDevices, pReg->szName),
                           VERR_PDM_INVALID_DEVICE_REGISTRATION);
+    AssertLogRelMsgReturn(pReg->cMaxMsixVectors <= VBOX_MSIX_MAX_ENTRIES,
+                          ("%#x (szName=%s)\n", pReg->cMaxMsixVectors, pReg->szName),
+                          VERR_PDM_INVALID_DEVICE_REGISTRATION);
 
     /*