Changeset 81638 in vbox

Timestamp:

Nov 4, 2019 6:03:32 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Don't assert pbVirtApic or HCPhysVirtApic when APIC device isn't present and we don't allocate or fetch these pages.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)

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

@@ -1858 +1858 @@
                 if (RT_FAILURE(rc))
                     return rc;
+                Assert(pVmcsInfo->pbVirtApic);
+                Assert(pVmcsInfo->HCPhysVirtApic && pVmcsInfo->HCPhysVirtApic != NIL_RTHCPHYS);
             }
         }
         else
+        {
             pVmcsInfo->pbVirtApic = (uint8_t *)CPUMGetGuestVmxVirtApicPage(pVCpu, &pVCpu->cpum.GstCtx,
                                                                            &pVmcsInfo->HCPhysVirtApic);
-        Assert(pVmcsInfo->pbVirtApic);
-        Assert(pVmcsInfo->HCPhysVirtApic && pVmcsInfo->HCPhysVirtApic != NIL_RTHCPHYS);
+            Assert(pVmcsInfo->pbVirtApic);
+            Assert(pVmcsInfo->HCPhysVirtApic && pVmcsInfo->HCPhysVirtApic != NIL_RTHCPHYS);
+        }
     }