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

Timestamp:

Dec 2, 2021 9:44:14 PM (3 years ago)

Author:

vboxsync

Message:

VMM/APIC,SUP: Driverless tweaks for the APIC code. bugref:10138

File:

• trunk/src/VBox/VMM/VMMR3/APIC.cpp (modified) (4 diffs)

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

@@ -1285 +1285 @@
     if (pApic->pvApicPibR3)
     {
-        AssertLogRelReturn(pApic->pvApicPibR0   != NIL_RTR0PTR,  VERR_INTERNAL_ERROR);
-        AssertLogRelReturn(pApic->HCPhysApicPib != NIL_RTHCPHYS, VERR_INTERNAL_ERROR);
+        bool const fDriverless = SUPR3IsDriverless();
+        AssertLogRelReturn(pApic->pvApicPibR0   != NIL_RTR0PTR  || fDriverless,  VERR_INTERNAL_ERROR);
+        AssertLogRelReturn(pApic->HCPhysApicPib != NIL_RTHCPHYS || fDriverless, VERR_INTERNAL_ERROR);
 
         /* Initialize the PIB. */
@@ -1312 +1313 @@
             if (RT_SUCCESS(rc))
             {
-                AssertLogRelReturn(pApicCpu->pvApicPageR3   != NIL_RTR3PTR,  VERR_INTERNAL_ERROR);
-                AssertLogRelReturn(pApicCpu->HCPhysApicPage != NIL_RTHCPHYS, VERR_INTERNAL_ERROR);
+                AssertLogRelReturn(pApicCpu->pvApicPageR3   != NIL_RTR3PTR  || fDriverless, VERR_INTERNAL_ERROR);
                 pApicCpu->HCPhysApicPage = SupApicPage.Phys;
+                AssertLogRelReturn(pApicCpu->HCPhysApicPage != NIL_RTHCPHYS || fDriverless, VERR_INTERNAL_ERROR);
 
                 /* Associate the per-VCPU PIB pointers to the per-VM PIB mapping. */
                 uint32_t const offApicPib  = idCpu * sizeof(APICPIB);
-                pApicCpu->pvApicPibR0      = (RTR0PTR)((RTR0UINTPTR)pApic->pvApicPibR0 + offApicPib);
+                pApicCpu->pvApicPibR0      = !fDriverless ? (RTR0PTR)((RTR0UINTPTR)pApic->pvApicPibR0 + offApicPib) : NIL_RTR0PTR;
                 pApicCpu->pvApicPibR3      = (RTR3PTR)((RTR3UINTPTR)pApic->pvApicPibR3 + offApicPib);
 
@@ -1327 +1328 @@
 #ifdef DEBUG_ramshankar
                 Assert(pApicCpu->pvApicPibR3 != NIL_RTR3PTR);
-                Assert(pApicCpu->pvApicPibR0 != NIL_RTR0PTR);
+                Assert(pApicCpu->pvApicPibR0 != NIL_RTR0PTR || fDriverless);
                 Assert(pApicCpu->pvApicPageR3 != NIL_RTR3PTR);
 #endif
@@ -1341 +1342 @@
 #ifdef DEBUG_ramshankar
         Assert(pApic->pvApicPibR3 != NIL_RTR3PTR);
-        Assert(pApic->pvApicPibR0 != NIL_RTR0PTR);
+        Assert(pApic->pvApicPibR0 != NIL_RTR0PTR || fDriverless);
 #endif
         return VINF_SUCCESS;