vbox的更動 99820 路徑 trunk/src/VBox/Devices/Bus/DevPCI.cpp

時間撮記:

2023-5-17 上午07:31:36 (22 月 以前)

作者:

vboxsync

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

157456

訊息:

Devices/Bus: Implement interrupt forwarding for the PCIe bus, bugref:10445

檔案:

• trunk/src/VBox/Devices/Bus/DevPCI.cpp (修改) (9 筆差異)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -290 +290 @@
 DECLINLINE(int) get_pci_irq_level(PDEVPCIROOT pGlobals, int irq_num)
 {
-    return (pGlobals->Piix3.auPciLegacyIrqLevels[irq_num] != 0);
+    return (pGlobals->u.Piix3.auPciLegacyIrqLevels[irq_num] != 0);
 }
 
@@ -347 +347 @@
             /* As per above treat ACPI in a special way */
             pic_irq = pPciDev->abConfig[PCI_INTERRUPT_LINE];
-            pGlobals->Piix3.iAcpiIrq = pic_irq;
-            pGlobals->Piix3.iAcpiIrqLevel = iLevel & PDM_IRQ_LEVEL_HIGH;
+            pGlobals->u.Piix3.iAcpiIrq = pic_irq;
+            pGlobals->u.Piix3.iAcpiIrqLevel = iLevel & PDM_IRQ_LEVEL_HIGH;
         }
         else
@@ -356 +356 @@
 
             if (pPciDev->Int.s.uIrqPinState == PDM_IRQ_LEVEL_HIGH)
-                ASMAtomicIncU32(&pGlobals->Piix3.auPciLegacyIrqLevels[irq_num]);
+                ASMAtomicIncU32(&pGlobals->u.Piix3.auPciLegacyIrqLevels[irq_num]);
             else if (pPciDev->Int.s.uIrqPinState == PDM_IRQ_LEVEL_LOW)
-                ASMAtomicDecU32(&pGlobals->Piix3.auPciLegacyIrqLevels[irq_num]);
+                ASMAtomicDecU32(&pGlobals->u.Piix3.auPciLegacyIrqLevels[irq_num]);
 
             /* now we change the pic irq level according to the piix irq mappings */
@@ -366 +366 @@
                 if ((iLevel & PDM_IRQ_LEVEL_FLIP_FLOP) == PDM_IRQ_LEVEL_FLIP_FLOP)
                 {
-                    ASMAtomicDecU32(&pGlobals->Piix3.auPciLegacyIrqLevels[irq_num]);
+                    ASMAtomicDecU32(&pGlobals->u.Piix3.auPciLegacyIrqLevels[irq_num]);
                     pPciDev->Int.s.uIrqPinState = PDM_IRQ_LEVEL_LOW;
                 }
@@ -384 +384 @@
         if (pic_irq == pbCfg[0x63])
             pic_level |= get_pci_irq_level(pGlobals, 3);    /* PIRQD */
-        if (pic_irq == pGlobals->Piix3.iAcpiIrq)
-            pic_level |= pGlobals->Piix3.iAcpiIrqLevel;
+        if (pic_irq == pGlobals->u.Piix3.iAcpiIrq)
+            pic_level |= pGlobals->u.Piix3.iAcpiIrqLevel;
 
         Log3Func(("%s: iLevel=%d iIrq=%d pic_irq=%d pic_level=%d uTagSrc=%#x\n",
@@ -988 +988 @@
      * Save IRQ states.
      */
-    for (unsigned i = 0; i < RT_ELEMENTS(pThis->Piix3.auPciLegacyIrqLevels); i++)
-        pHlp->pfnSSMPutU32(pSSM, pThis->Piix3.auPciLegacyIrqLevels[i]);
+    for (unsigned i = 0; i < RT_ELEMENTS(pThis->u.Piix3.auPciLegacyIrqLevels); i++)
+        pHlp->pfnSSMPutU32(pSSM, pThis->u.Piix3.auPciLegacyIrqLevels[i]);
     for (unsigned i = 0; i < RT_ELEMENTS(pThis->auPciApicIrqLevels); i++)
         pHlp->pfnSSMPutU32(pSSM, pThis->auPciApicIrqLevels[i]);
 
-    pHlp->pfnSSMPutU32(pSSM, pThis->Piix3.iAcpiIrqLevel);
-    pHlp->pfnSSMPutS32(pSSM, pThis->Piix3.iAcpiIrq);
+    pHlp->pfnSSMPutU32(pSSM, pThis->u.Piix3.iAcpiIrqLevel);
+    pHlp->pfnSSMPutS32(pSSM, pThis->u.Piix3.iAcpiIrq);
 
     pHlp->pfnSSMPutU32(pSSM, UINT32_MAX);      /* separator */
@@ -1170 +1170 @@
     if (uVersion >= VBOX_PCI_SAVED_STATE_VERSION_IRQ_STATES)
     {
-        for (uint8_t i = 0; i < RT_ELEMENTS(pThis->Piix3.auPciLegacyIrqLevels); i++)
-            pHlp->pfnSSMGetU32V(pSSM, &pThis->Piix3.auPciLegacyIrqLevels[i]);
+        for (uint8_t i = 0; i < RT_ELEMENTS(pThis->u.Piix3.auPciLegacyIrqLevels); i++)
+            pHlp->pfnSSMGetU32V(pSSM, &pThis->u.Piix3.auPciLegacyIrqLevels[i]);
         for (uint8_t i = 0; i < RT_ELEMENTS(pThis->auPciApicIrqLevels); i++)
             pHlp->pfnSSMGetU32V(pSSM, &pThis->auPciApicIrqLevels[i]);
 
-        pHlp->pfnSSMGetU32(pSSM, &pThis->Piix3.iAcpiIrqLevel);
-        pHlp->pfnSSMGetS32(pSSM, &pThis->Piix3.iAcpiIrq);
+        pHlp->pfnSSMGetU32(pSSM, &pThis->u.Piix3.iAcpiIrqLevel);
+        pHlp->pfnSSMGetS32(pSSM, &pThis->u.Piix3.iAcpiIrq);
     }
 
@@ -1230 +1230 @@
     pHlp->pfnPrintf(pHlp, "PCI IRQ levels:\n");
     for (int i = 0; i < DEVPCI_LEGACY_IRQ_PINS; ++i)
-        pHlp->pfnPrintf(pHlp, "  IRQ%c: %u\n", 'A' + i, pGlobals->Piix3.auPciLegacyIrqLevels[i]);
+        pHlp->pfnPrintf(pHlp, "  IRQ%c: %u\n", 'A' + i, pGlobals->u.Piix3.auPciLegacyIrqLevels[i]);
 }
 
@@ -1301 +1301 @@
     pGlobals->uPciBiosIo   = 0xc000;
     pGlobals->uPciBiosMmio = 0xf0000000;
-    memset((void *)&pGlobals->Piix3.auPciLegacyIrqLevels, 0, sizeof(pGlobals->Piix3.auPciLegacyIrqLevels));
+    memset((void *)&pGlobals->u.Piix3.auPciLegacyIrqLevels, 0, sizeof(pGlobals->u.Piix3.auPciLegacyIrqLevels));
     pGlobals->fUseIoApic   = fUseIoApic;
     memset((void *)&pGlobals->auPciApicIrqLevels, 0, sizeof(pGlobals->auPciApicIrqLevels));