Changeset 78614 in vbox for trunk/src/VBox

Timestamp:

May 21, 2019 6:32:01 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Guest-linear address for string I/O VM-exits do not depend on the CPU feature.

File:

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

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

@@ -12545 +12545 @@
                 bool const fVmxInsOutsInfo = pVM->cpum.ro.GuestFeatures.fVmxInsOutInfo;
                 bool const fIOString       = VMX_EXIT_QUAL_IO_IS_STRING(pVmxTransient->uExitQual);
-                if (   fVmxInsOutsInfo
-                    && fIOString)
+                if (fIOString)
                 {
-                    Assert(RT_BF_GET(pVM->hm.s.vmx.Msrs.u64Basic, VMX_BF_BASIC_VMCS_INS_OUTS)); /* Paranoia. */
-                    rc  = hmR0VmxReadExitInstrInfoVmcs(pVmxTransient);
                     rc |= hmR0VmxReadGuestLinearAddrVmcs(pVCpu, pVmxTransient);
-                    AssertRCReturn(rc, rc);
+                    if (fVmxInsOutsInfo)
+                    {
+                        Assert(RT_BF_GET(pVM->hm.s.vmx.Msrs.u64Basic, VMX_BF_BASIC_VMCS_INS_OUTS)); /* Paranoia. */
+                        rc |= hmR0VmxReadExitInstrInfoVmcs(pVmxTransient);
+                    }
+                    else
+                        pVmxTransient->ExitInstrInfo.u  = 0;
                 }
                 else
-                {
-                    pVmxTransient->ExitInstrInfo.u  = 0;
                     pVmxTransient->uGuestLinearAddr = 0;
-                }
+                AssertRCReturn(rc, rc);
 
                 VMXVEXITINFO ExitInfo;