VirtualBox

Changeset 67050 in vbox for trunk


Ignore:
Timestamp:
May 24, 2017 5:44:32 AM (7 years ago)
Author:
vboxsync
Message:

VMM/APIC, HMVMXR0: Fixes for when the APIC isn't present.

Location:
trunk/src/VBox/VMM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/VMM/VMMAll/APICAll.cpp

    r65919 r67050  
    33083308    AssertReturn(pR0Ptr,  VERR_INVALID_PARAMETER);
    33093309
    3310     PCAPICCPU pApicCpu = VMCPU_TO_APICCPU(pVCpu);
    3311     *pHCPhys = pApicCpu->HCPhysApicPage;
    3312     *pR0Ptr  = pApicCpu->pvApicPageR0;
     3310    if (PDMHasApic(pVCpu->CTX_SUFF(pVM)))
     3311    {
     3312        PCAPICCPU pApicCpu = VMCPU_TO_APICCPU(pVCpu);
     3313        *pHCPhys = pApicCpu->HCPhysApicPage;
     3314        *pR0Ptr  = pApicCpu->pvApicPageR0;
     3315        if (pR3Ptr)
     3316            *pR3Ptr  = pApicCpu->pvApicPageR3;
     3317        if (pRCPtr)
     3318            *pRCPtr  = pApicCpu->pvApicPageRC;
     3319        return VINF_SUCCESS;
     3320    }
     3321
     3322    *pHCPhys = 0;
     3323    *pR0Ptr  = NIL_RTR0PTR;
    33133324    if (pR3Ptr)
    3314         *pR3Ptr  = pApicCpu->pvApicPageR3;
     3325        *pR3Ptr  = NIL_RTR3PTR;
    33153326    if (pRCPtr)
    3316         *pRCPtr  = pApicCpu->pvApicPageRC;
    3317     return VINF_SUCCESS;
    3318 }
    3319 
     3327        *pRCPtr  = NIL_RTRCPTR;
     3328    return VERR_PDM_NO_APIC_INSTANCE;
     3329}
     3330
  • trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

    r67026 r67050  
    10081008
    10091009        /* Get the allocated virtual-APIC page from the APIC device for transparent TPR accesses. */
    1010         if (pVM->hm.s.vmx.Msrs.VmxProcCtls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_USE_TPR_SHADOW)
     1010        if (   PDMHasApic(pVM)
     1011            && (pVM->hm.s.vmx.Msrs.VmxProcCtls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_USE_TPR_SHADOW))
    10111012        {
    10121013            rc = APICGetApicPageForCpu(pVCpu, &pVCpu->hm.s.vmx.HCPhysVirtApic, (PRTR0PTR)&pVCpu->hm.s.vmx.pbVirtApic,
     
    24082409
    24092410    /* Use TPR shadowing if supported by the CPU. */
    2410     if (pVM->hm.s.vmx.Msrs.VmxProcCtls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_USE_TPR_SHADOW)
     2411    if (   PDMHasApic(pVM)
     2412        && pVM->hm.s.vmx.Msrs.VmxProcCtls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_USE_TPR_SHADOW)
    24112413    {
    24122414        Assert(pVCpu->hm.s.vmx.HCPhysVirtApic);
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette