Changeset 74649 in vbox for trunk/src/VBox

Timestamp:

Oct 7, 2018 7:05:18 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 VM-exit bits; Added reading VTPR for RDMSR.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -6486 +6486 @@
         if (iemVmxIsRdmsrWrmsrInterceptSet(pVCpu, VMX_EXIT_RDMSR, pVCpu->cpum.GstCtx.ecx))
             IEM_VMX_VMEXIT_INSTR_RET(pVCpu, VMX_EXIT_RDMSR, cbInstr);
+
+        /** @todo NSTVMX: Handle other x2APIC MSRs in VMX non-root mode. Perhaps having a
+         *        dedicated virtual-APIC device might be better... */
+        if (   pVCpu->cpum.GstCtx.ecx == MSR_IA32_X2APIC_TPR
+            && IEM_VMX_IS_PROCCTLS2_SET(pVCpu, VMX_PROC_CTLS2_VIRT_X2APIC_MODE))
+        {
+            uint32_t const uVTpr = iemVmxVirtApicReadRaw32(pVCpu, XAPIC_OFF_TPR);
+            pVCpu->cpum.GstCtx.rax = uVTpr;
+            pVCpu->cpum.GstCtx.rdx = 0;
+            iemRegAddToRipAndClearRF(pVCpu, cbInstr);
+            return VINF_SUCCESS;
+        }
     }
 #endif
@@ -6582 +6594 @@
                         && !(uValue.s.Lo & UINT32_C(0xffffff00)))
                     {
-                        uint32_t const uVTpr = (uValue.s.Lo & 0xf) << 4;
+                        uint32_t const uVTpr = uValue.s.Lo;
                         iemVmxVirtApicWriteRaw32(pVCpu, uVTpr, XAPIC_OFF_TPR);
                         VBOXSTRICTRC rcStrict = iemVmxVmexitTprVirtualization(pVCpu, cbInstr);