Changeset 56663 in vbox for trunk/src/VBox

Timestamp:

Jun 27, 2015 8:31:14 PM (9 years ago)

Author:

vboxsync

Message:

HMSVMR0.cpp: VT-x and IEM insists on having busy TSS descriptor types in hidden TR, not the available kind. AMD-V seems more lax, so make it busy to keep the others happy.

File:

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

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

@@ -2015 +2015 @@
      * Fixup TR attributes so it's compatible with Intel. Important when saved-states are used
      * between Intel and AMD. See @bugref{6208} comment #39.
+     * ASSUME that it's normally correct and that we're in 32-bit or 64-bit mode.
      */
     HMSVM_SAVE_SEG_REG(TR, tr);
-    if (CPUMIsGuestInLongModeEx(pMixedCtx))
-        pMixedCtx->tr.Attr.n.u4Type = X86_SEL_TYPE_SYS_386_TSS_BUSY;
+    if (pMixedCtx->tr.Attr.n.u4Type != X86_SEL_TYPE_SYS_386_TSS_BUSY)
+    {
+        if (   pMixedCtx->tr.Attr.n.u4Type == X86_SEL_TYPE_SYS_386_TSS_AVAIL
+            || CPUMIsGuestInLongModeEx(pMixedCtx))
+            pMixedCtx->tr.Attr.n.u4Type = X86_SEL_TYPE_SYS_386_TSS_BUSY;
+        else if (pMixedCtx->tr.Attr.n.u4Type == X86_SEL_TYPE_SYS_286_TSS_AVAIL)
+            pMixedCtx->tr.Attr.n.u4Type = X86_SEL_TYPE_SYS_286_TSS_BUSY;
+    }
 
     /*