Changeset 60435 in vbox

Timestamp:

Apr 11, 2016 5:30:26 PM (8 years ago)

Author:

vboxsync

Message:

VMM/APIC: Nits.

File:

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

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

@@ -1048 +1048 @@
         {
             pApic->HCPhysApicPib = SupApicPib.Phys;
-            Assert(pApic->HCPhysApicPib != NIL_RTHCPHYS);
-            Assert(pApic->pvApicPibR3);
+            AssertReturn(pApic->pvApicPibR3, VERR_INVALID_POINTER);
+            memset((void *)pApic->pvApicPibR3, 0, pApic->cbApicPib);
         }
         else
@@ -1062 +1062 @@
     if (pApic->pvApicPibR3)
     {
+        Assert(pApic->pvApicPibR0 != NIL_RTR0PTR);
+        Assert(pApic->HCPhysApicPib != NIL_RTHCPHYS);
+
         /* Map the pending-interrupt bitmap (PIB) into GC.  */
         if (fNeedGCMapping)
@@ -1095 +1098 @@
                 pApicCpu->HCPhysApicPage = SupApicPage.Phys;
                 Assert(pApicCpu->HCPhysApicPage != NIL_RTHCPHYS);
+                Assert(pApicCpu->pvApicPageR3);
 
                 /* Map the virtual-APIC page into GC. */