Changeset 9805 in vbox

Timestamp:

Jun 18, 2008 4:18:28 PM (17 years ago)

Author:

vboxsync

Message:

Backed out previous changeset

File:

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

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

@@ -682 +682 @@
 
         /* The base values in the hidden fs & gs registers are not in sync with the msrs; they are cut to 32 bits. */
-        if (CPUMIsGuestIn64BitCodeEx(pCtx))
-        {
-            rc  = VMXWriteVMCS(VMX_VMCS_GUEST_FIELD_FS,         pCtx->fs);
-            rc |= VMXWriteVMCS(VMX_VMCS_GUEST_FS_LIMIT,         pCtx->fsHid.u32Limit);
-            rc |= VMXWriteVMCS(VMX_VMCS_GUEST_FS_BASE,          pCtx->fsHid.u64Base);
-            rc |= VMXWriteVMCS(VMX_VMCS_GUEST_FS_ACCESS_RIGHTS, pCtx->fsHid.Attr.u);
-            AssertRC(rc);
-
-            rc  = VMXWriteVMCS(VMX_VMCS_GUEST_FIELD_GS,         pCtx->gs);
-            rc |= VMXWriteVMCS(VMX_VMCS_GUEST_GS_LIMIT,         pCtx->gsHid.u32Limit);
-            rc |= VMXWriteVMCS(VMX_VMCS_GUEST_GS_BASE,          pCtx->gsHid.u64Base);
-            rc |= VMXWriteVMCS(VMX_VMCS_GUEST_GS_ACCESS_RIGHTS, pCtx->gsHid.Attr.u);
-            AssertRC(rc);
-        }
-        else
-        {
-            VMX_WRITE_SELREG(FS, fs);
-            AssertRC(rc);
-
-            VMX_WRITE_SELREG(GS, gs);
-            AssertRC(rc);
-        }
+        VMX_WRITE_SELREG(FS, fs);
+        AssertRC(rc);
+
+        VMX_WRITE_SELREG(GS, gs);
+        AssertRC(rc);
     }
 
@@ -979 +962 @@
 
     /* 64 bits guest mode? */
-    if (CPUMIsGuestIn64BitCodeEx(pCtx))
+    if (pCtx->msrEFER & MSR_K6_EFER_LMA)
     {
 #ifndef VBOX_WITH_64_BITS_GUESTS