Changeset 76738 in vbox for trunk

Timestamp:

Jan 9, 2019 1:45:27 PM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Fix typo while fetching the host segment register from the VMCS during VM-exit. Fix assertion that checks that high bits are all clear (only makes sense when the VM-exit succeeded, as failed VM-exits sets bit 31)

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (4 diffs)

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

@@ -743 +743 @@
     RTSEL HostSel;
     uint8_t  const  uWidth     = VMX_VMCS_ENC_WIDTH_16BIT;
-    uint8_t  const  uType      = VMX_VMCS_ENC_TYPE_GUEST_STATE;
+    uint8_t  const  uType      = VMX_VMCS_ENC_TYPE_HOST_STATE;
     uint8_t  const  uWidthType = (uWidth << 2) | uType;
     uint8_t  const  uIndex     = (iSegReg << 1) + RT_BF_GET(VMX_VMCS16_GUEST_ES_SEL, VMX_BF_VMCS_ENC_INDEX);
@@ -2150 +2150 @@
     for (unsigned iSegReg = 0; iSegReg < X86_SREG_COUNT; iSegReg++)
     {
-        RTSEL const HostSel  = iemVmxVmcsGetHostSelReg(pVmcs, iSegReg);
+        RTSEL const HostSel   = iemVmxVmcsGetHostSelReg(pVmcs, iSegReg);
         bool const  fUnusable = RT_BOOL(HostSel == 0);
 
@@ -2849 +2849 @@
     if (!fVmentryFailed)
     {
+        /*
+         * The rest of the high bits of the VM-exit reason are only relevant when the VM-exit
+         * occurs in enclave mode/SMM which we don't support yet.
+         *
+         * If we ever add support for it, we can pass just the lower bits, till then an assert
+         * should suffice.
+         */
+        Assert(!RT_HI_U16(uExitReason));
+
         iemVmxVmexitSaveGuestState(pVCpu, uExitReason);
         int rc = iemVmxVmexitSaveGuestAutoMsrs(pVCpu, uExitReason);
@@ -2864 +2873 @@
         iemVmxVmexitRestoreForceFlags(pVCpu);
     }
-
-    /*
-     * The high bits of the VM-exit reason are only relevant when the VM-exit occurs in
-     * enclave mode/SMM which we don't support yet. If we ever add support for it, we can
-     * pass just the lower bits, till then an assert should suffice.
-     */
-    Assert(!RT_HI_U16(uExitReason));
 
     VBOXSTRICTRC rcStrict = iemVmxVmexitLoadHostState(pVCpu, uExitReason);