Changeset 10886 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jul 25, 2008 11:30:55 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

33709

Message:

Fixes for syncing back sysenter MSRs.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (2 diffs)
• HWVMXR0.cpp (modified) (2 diffs)

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

@@ -1153 +1153 @@
     SVM_READ_SELREG(GS, gs);
 
+    /*
+     * System MSRs
+     */
+    pCtx->SysEnter.cs       = pVMCB->guest.u64SysEnterCS;
+    pCtx->SysEnter.eip      = pVMCB->guest.u64SysEnterEIP;
+    pCtx->SysEnter.esp      = pVMCB->guest.u64SysEnterESP;
+
     /* Note: no reason to sync back the CRx and DRx registers. They can't be changed by the guest. */
     /* Note: only in the nested paging case can CR3 & CR4 be changed by the guest. */
@@ -1875 +1882 @@
         pCtx->idtr.cbIdt        = pVMCB->guest.IDTR.u32Limit;
         pCtx->idtr.pIdt         = pVMCB->guest.IDTR.u64Base;
-
-        /*
-         * System MSRs
-         */
-        pCtx->SysEnter.cs       = pVMCB->guest.u64SysEnterCS;
-        pCtx->SysEnter.eip      = pVMCB->guest.u64SysEnterEIP;
-        pCtx->SysEnter.esp      = pVMCB->guest.u64SysEnterESP;
     }
 

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

@@ -1476 +1476 @@
     VMX_READ_SELREG(FS, fs);
     VMX_READ_SELREG(GS, gs);
+
+    /*
+     * System MSRs
+     */
+    VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_CS,      &val);
+    pCtx->SysEnter.cs       = val;
+    VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_EIP,     &val);
+    pCtx->SysEnter.eip      = val;
+    VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_ESP,     &val);
+    pCtx->SysEnter.esp      = val;
 
     /** @note NOW IT'S SAFE FOR LOGGING! */
@@ -2169 +2179 @@
         VMXReadVMCS(VMX_VMCS_GUEST_IDTR_BASE,        &val);
         pCtx->idtr.pIdt         = val;
-
-        /*
-         * System MSRs
-         */
-        VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_CS,      &val);
-        pCtx->SysEnter.cs       = val;
-        VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_EIP,     &val);
-        pCtx->SysEnter.eip      = val;
-        VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_ESP,     &val);
-        pCtx->SysEnter.esp      = val;
     }