Changeset 78259 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Apr 23, 2019 10:40:45 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Use the VMCS info. from the VMX-transient object. It should be valid at this point.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

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

@@ -7280 +7280 @@
             if (RT_SUCCESS(rc))
             {
-                if (u32Val & (  VMX_VMCS_GUEST_INT_STATE_BLOCK_MOVSS
-                              | VMX_VMCS_GUEST_INT_STATE_BLOCK_STI))
+                if (u32Val & (VMX_VMCS_GUEST_INT_STATE_BLOCK_MOVSS | VMX_VMCS_GUEST_INT_STATE_BLOCK_STI))
                     EMSetInhibitInterruptsPC(pVCpu, pVCpu->cpum.GstCtx.rip);
                 else if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
@@ -10255 +10254 @@
      */
     PVM pVM = pVCpu->CTX_SUFF(pVM);
-    PVMXVMCSINFO pVmcsInfo = hmGetVmxActiveVmcsInfo(pVCpu);
+    PCVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
+    Assert(pVmcsInfo);
     if (   !pVCpu->hm.s.vmx.u64GstMsrApicBase
         && (pVmcsInfo->u32ProcCtls2 & VMX_PROC_CTLS2_VIRT_APIC_ACCESS)