Changeset 88641 in vbox

Timestamp:

Apr 22, 2021 6:20:26 AM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 PDM naming consistency.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/PDMR0DevHlp.cpp (modified) (3 diffs)
• VMMR0/PDMR0DevHlpTracing.cpp (modified) (1 diff)
• VMMR3/PDMDevHlp.cpp (modified) (4 diffs)
• include/PDMInternal.h (modified) (3 diffs)

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

@@ -250 +250 @@
         pTask->enmOp = PDMDEVHLPTASKOP_PCI_SET_IRQ;
         pTask->pDevInsR3 = PDMDEVINS_2_R3PTR(pDevIns);
-        pTask->u.PciSetIRQ.iIrq = iIrq;
-        pTask->u.PciSetIRQ.iLevel = iLevel;
-        pTask->u.PciSetIRQ.uTagSrc = uTagSrc;
-        pTask->u.PciSetIRQ.pPciDevR3 = MMHyperR0ToR3(pGVM, pPciDev);
+        pTask->u.PciSetIrq.iIrq = iIrq;
+        pTask->u.PciSetIrq.iLevel = iLevel;
+        pTask->u.PciSetIrq.uTagSrc = uTagSrc;
+        pTask->u.PciSetIrq.pPciDevR3 = MMHyperR0ToR3(pGVM, pPciDev);
 
         PDMQueueInsertEx(pGVM->pdm.s.pDevHlpQueueR0, &pTask->Core, 0);
@@ -1604 +1604 @@
             pTask->enmOp = PDMDEVHLPTASKOP_IOAPIC_SET_IRQ;
             pTask->pDevInsR3 = NIL_RTR3PTR; /* not required */
-            pTask->u.IoApicSetIRQ.uBusDevFn = uBusDevFn;
-            pTask->u.IoApicSetIRQ.iIrq = iIrq;
-            pTask->u.IoApicSetIRQ.iLevel = iLevel;
-            pTask->u.IoApicSetIRQ.uTagSrc = uTagSrc;
+            pTask->u.IoApicSetIrq.uBusDevFn = uBusDevFn;
+            pTask->u.IoApicSetIrq.iIrq = iIrq;
+            pTask->u.IoApicSetIrq.iLevel = iLevel;
+            pTask->u.IoApicSetIrq.uTagSrc = uTagSrc;
 
             PDMQueueInsertEx(pGVM->pdm.s.pDevHlpQueueR0, &pTask->Core, 0);
@@ -1821 +1821 @@
     pTask->enmOp = PDMDEVHLPTASKOP_ISA_SET_IRQ;
     pTask->pDevInsR3 = NIL_RTR3PTR; /* not required */
-    pTask->u.IsaSetIRQ.uBusDevFn = NIL_PCIBDF;
-    pTask->u.IsaSetIRQ.iIrq = iIrq;
-    pTask->u.IsaSetIRQ.iLevel = iLevel;
-    pTask->u.IsaSetIRQ.uTagSrc = uTagSrc;
+    pTask->u.IsaSetIrq.uBusDevFn = NIL_PCIBDF;
+    pTask->u.IsaSetIrq.iIrq = iIrq;
+    pTask->u.IsaSetIrq.iLevel = iLevel;
+    pTask->u.IsaSetIrq.uTagSrc = uTagSrc;
 
     PDMQueueInsertEx(pGVM->pdm.s.pDevHlpQueueR0, &pTask->Core, 0);

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

@@ -413 +413 @@
         pTask->enmOp = PDMDEVHLPTASKOP_PCI_SET_IRQ;
         pTask->pDevInsR3 = PDMDEVINS_2_R3PTR(pDevIns);
-        pTask->u.PciSetIRQ.iIrq = iIrq;
-        pTask->u.PciSetIRQ.iLevel = iLevel;
-        pTask->u.PciSetIRQ.uTagSrc = uTagSrc;
-        pTask->u.PciSetIRQ.pPciDevR3 = MMHyperR0ToR3(pGVM, pPciDev);
+        pTask->u.PciSetIrq.iIrq = iIrq;
+        pTask->u.PciSetIrq.iLevel = iLevel;
+        pTask->u.PciSetIrq.uTagSrc = uTagSrc;
+        pTask->u.PciSetIrq.pPciDevR3 = MMHyperR0ToR3(pGVM, pPciDev);
 
         PDMQueueInsertEx(pGVM->pdm.s.pDevHlpQueueR0, &pTask->Core, 0);

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

@@ -5362 +5362 @@
     {
         case PDMDEVHLPTASKOP_ISA_SET_IRQ:
-            PDMIsaSetIrq(pVM, pTask->u.IsaSetIRQ.iIrq, pTask->u.IsaSetIRQ.iLevel, pTask->u.IsaSetIRQ.uTagSrc);
+            PDMIsaSetIrq(pVM, pTask->u.IsaSetIrq.iIrq, pTask->u.IsaSetIrq.iLevel, pTask->u.IsaSetIrq.uTagSrc);
             break;
 
@@ -5368 +5368 @@
         {
             /* Same as pdmR3DevHlp_PCISetIrq, except we've got a tag already. */
-            PPDMPCIDEV pPciDev = pTask->u.PciSetIRQ.pPciDevR3;
+            PPDMPCIDEV pPciDev = pTask->u.PciSetIrq.pPciDevR3;
             if (pPciDev)
             {
@@ -5376 +5376 @@
 
                 pdmLock(pVM);
-                pBus->pfnSetIrqR3(pBus->pDevInsR3, pPciDev, pTask->u.PciSetIRQ.iIrq,
-                                  pTask->u.PciSetIRQ.iLevel, pTask->u.PciSetIRQ.uTagSrc);
+                pBus->pfnSetIrqR3(pBus->pDevInsR3, pPciDev, pTask->u.PciSetIrq.iIrq,
+                                  pTask->u.PciSetIrq.iLevel, pTask->u.PciSetIrq.uTagSrc);
                 pdmUnlock(pVM);
             }
@@ -5387 +5387 @@
         case PDMDEVHLPTASKOP_IOAPIC_SET_IRQ:
         {
-            PDMIoApicSetIrq(pVM, pTask->u.IoApicSetIRQ.uBusDevFn, pTask->u.IoApicSetIRQ.iIrq, pTask->u.IoApicSetIRQ.iLevel,
-                            pTask->u.IoApicSetIRQ.uTagSrc);
+            PDMIoApicSetIrq(pVM, pTask->u.IoApicSetIrq.uBusDevFn, pTask->u.IoApicSetIrq.iIrq, pTask->u.IoApicSetIrq.iLevel,
+                            pTask->u.IoApicSetIrq.uTagSrc);
             break;
         }

trunk/src/VBox/VMM/include/PDMInternal.h

@@ -1203 +1203 @@
     /** The usual invalid 0 entry. */
     PDMDEVHLPTASKOP_INVALID = 0,
-    /** ISASetIrq */
+    /** IsaSetIrq, IoApicSetIrq */
     PDMDEVHLPTASKOP_ISA_SET_IRQ,
-    /** PCISetIrq */
+    /** PciSetIrq */
     PDMDEVHLPTASKOP_PCI_SET_IRQ,
-    /** PCISetIrq */
+    /** PciSetIrq */
     PDMDEVHLPTASKOP_IOAPIC_SET_IRQ,
     /** IoApicSendMsi */
@@ -1245 +1245 @@
             /** The IRQ tag and source. */
             uint32_t                uTagSrc;
-        } IsaSetIRQ, IoApicSetIRQ;
+        } IsaSetIrq, IoApicSetIrq;
 
         /**
@@ -1260 +1260 @@
             /** The IRQ tag and source. */
             uint32_t                uTagSrc;
-        } PciSetIRQ;
+        } PciSetIrq;
 
         /**