Changeset 108443 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Mar 4, 2025 8:15:22 PM (2 months ago)

Author:

vboxsync

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

167817

Message:

VMM/GIC: bugref:10404 Fixes to the interrupt priority logic which fixes hang during arm64 Windows 11 guest boot.
Other minor cleanups.

File:

• trunk/src/VBox/VMM/VMMR3/GICR3.cpp (modified) (7 diffs)

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

@@ -112 +112 @@
 
     pHlp->pfnPrintf(pHlp, "VCPU[%u] ICC state:\n", pVCpu->idCpu);
-    pHlp->pfnPrintf(pHlp, "  fIrqGrp0Enabled    = %RTbool\n", pGicCpu->fIrqGrp0Enabled);
-    pHlp->pfnPrintf(pHlp, "  fIrqGrp1Enabled    = %RTbool\n", pGicCpu->fIrqGrp1Enabled);
+    pHlp->pfnPrintf(pHlp, "  fIntrGroup0Enabled = %RTbool\n", pGicCpu->fIntrGroup0Enabled);
+    pHlp->pfnPrintf(pHlp, "  fIntrGroup1Enabled = %RTbool\n", pGicCpu->fIntrGroup1Enabled);
     pHlp->pfnPrintf(pHlp, "  bInterruptPriority = %u\n",      pGicCpu->bInterruptPriority);
     pHlp->pfnPrintf(pHlp, "  bBinaryPointGrp0   = %u\n",      pGicCpu->bBinaryPointGrp0);
@@ -167 +167 @@
 #endif
 
-    pHlp->pfnPrintf(pHlp, "  fIrqGrp0Enabled    = %RTbool\n", pGicDev->fIrqGrp0Enabled);
-    pHlp->pfnPrintf(pHlp, "  fIrqGrp1Enabled    = %RTbool\n", pGicDev->fIrqGrp1Enabled);
+    pHlp->pfnPrintf(pHlp, "  fIntrGroup0Enabled = %RTbool\n", pGicDev->fIntrGroup0Enabled);
+    pHlp->pfnPrintf(pHlp, "  fIntrGroup1Enabled = %RTbool\n", pGicDev->fIntrGroup1Enabled);
 }
 
@@ -223 +223 @@
 
     pHlp->pfnPrintf(pHlp, "VCPU[%u] ICC state:\n", pVCpu->idCpu);
-    pHlp->pfnPrintf(pHlp, "  fIrqGrp0Enabled    = %RTbool\n", pGicCpu->fIrqGrp0Enabled);
-    pHlp->pfnPrintf(pHlp, "  fIrqGrp1Enabled    = %RTbool\n", pGicCpu->fIrqGrp1Enabled);
+    pHlp->pfnPrintf(pHlp, "  fIntrGroup0Enabled = %RTbool\n", pGicCpu->fIntrGroup0Enabled);
+    pHlp->pfnPrintf(pHlp, "  fIntrGroup1Enabled = %RTbool\n", pGicCpu->fIntrGroup1Enabled);
     pHlp->pfnPrintf(pHlp, "  bInterruptPriority = %u\n",      pGicCpu->bInterruptPriority);
     pHlp->pfnPrintf(pHlp, "  bBinaryPointGrp0   = %u\n",      pGicCpu->bBinaryPointGrp0);
@@ -384 +384 @@
     pHlp->pfnSSMPutBool(pSSM, pGicDev->fRangeSelSupport);
 #endif
-    pHlp->pfnSSMPutBool(pSSM, pGicDev->fIrqGrp0Enabled);
-    pHlp->pfnSSMPutBool(pSSM, pGicDev->fIrqGrp1Enabled);
+    pHlp->pfnSSMPutBool(pSSM, pGicDev->fIntrGroup0Enabled);
+    pHlp->pfnSSMPutBool(pSSM, pGicDev->fIntrGroup1Enabled);
     pHlp->pfnSSMPutBool(pSSM, pGicDev->fAffRoutingEnabled);
     GIC_SSM_PUT_ARRAY(pHlp->pfnSSMPutU32, pGicDev->bmIntrGroup);
@@ -417 +417 @@
         pHlp->pfnSSMPutU8(pSSM,              pGicCpu->bBinaryPointGrp0);
         pHlp->pfnSSMPutU8(pSSM,              pGicCpu->bBinaryPointGrp1);
-        pHlp->pfnSSMPutBool(pSSM,            pGicCpu->fIrqGrp0Enabled);
-        pHlp->pfnSSMPutBool(pSSM,            pGicCpu->fIrqGrp1Enabled);
+        pHlp->pfnSSMPutBool(pSSM,            pGicCpu->fIntrGroup0Enabled);
+        pHlp->pfnSSMPutBool(pSSM,            pGicCpu->fIntrGroup1Enabled);
     }
 
@@ -531 +531 @@
     pHlp->pfnSSMGetBool(pSSM, &pGicDev->fRangeSelSupport);
 #endif
-    pHlp->pfnSSMGetBool(pSSM, &pGicDev->fIrqGrp0Enabled);
-    pHlp->pfnSSMGetBool(pSSM, &pGicDev->fIrqGrp1Enabled);
+    pHlp->pfnSSMGetBool(pSSM, &pGicDev->fIntrGroup0Enabled);
+    pHlp->pfnSSMGetBool(pSSM, &pGicDev->fIntrGroup1Enabled);
     pHlp->pfnSSMGetBool(pSSM, &pGicDev->fAffRoutingEnabled);
     GIC_SSM_GET_ARRAY(pHlp->pfnSSMGetU32, pGicDev->bmIntrGroup);
@@ -564 +564 @@
         pHlp->pfnSSMGetU8(pSSM,              &pGicCpu->bBinaryPointGrp0);
         pHlp->pfnSSMGetU8(pSSM,              &pGicCpu->bBinaryPointGrp1);
-        pHlp->pfnSSMGetBool(pSSM,            &pGicCpu->fIrqGrp0Enabled);
-        pHlp->pfnSSMGetBool(pSSM,            &pGicCpu->fIrqGrp1Enabled);
+        pHlp->pfnSSMGetBool(pSSM,            &pGicCpu->fIntrGroup0Enabled);
+        pHlp->pfnSSMGetBool(pSSM,            &pGicCpu->fIntrGroup1Enabled);
     }