Changeset 67051 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

May 24, 2017 7:41:42 AM (8 years ago)

Author:

vboxsync

Message:

VMM/APIC: Assertion is sufficient, caller is responsible for calling only when an APIC is present.

File:

• trunk/src/VBox/VMM/VMMAll/APICAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/APICAll.cpp

@@ -3308 +3308 @@
     AssertReturn(pR0Ptr,  VERR_INVALID_PARAMETER);
 
-    if (PDMHasApic(pVCpu->CTX_SUFF(pVM)))
-    {
-        PCAPICCPU pApicCpu = VMCPU_TO_APICCPU(pVCpu);
-        *pHCPhys = pApicCpu->HCPhysApicPage;
-        *pR0Ptr  = pApicCpu->pvApicPageR0;
-        if (pR3Ptr)
-            *pR3Ptr  = pApicCpu->pvApicPageR3;
-        if (pRCPtr)
-            *pRCPtr  = pApicCpu->pvApicPageRC;
-        return VINF_SUCCESS;
-    }
-
-    *pHCPhys = 0;
-    *pR0Ptr  = NIL_RTR0PTR;
+    Assert(PDMHasApic(pVCpu->CTX_SUFF(pVM)));
+
+    PCAPICCPU pApicCpu = VMCPU_TO_APICCPU(pVCpu);
+    *pHCPhys = pApicCpu->HCPhysApicPage;
+    *pR0Ptr  = pApicCpu->pvApicPageR0;
     if (pR3Ptr)
-        *pR3Ptr  = NIL_RTR3PTR;
+        *pR3Ptr  = pApicCpu->pvApicPageR3;
     if (pRCPtr)
-        *pRCPtr  = NIL_RTRCPTR;
-    return VERR_PDM_NO_APIC_INSTANCE;
-}
-
+        *pRCPtr  = pApicCpu->pvApicPageRC;
+    return VINF_SUCCESS;
+}
+