Changeset 12698 in vbox

Timestamp:

Sep 24, 2008 3:47:30 PM (17 years ago)

Author:

vboxsync

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

37005

Message:

Corrections

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.h (modified) (1 diff)
• HWVMXR0.cpp (modified) (1 diff)
• HWVMXR0.h (modified) (4 diffs)

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

@@ -141 +141 @@
 
 #define SVM_WRITE_SELREG(REG, reg)                                      \
+{                                                                       \
         pVMCB->guest.REG.u16Sel   = pCtx->reg;                          \
         pVMCB->guest.REG.u32Limit = pCtx->reg##Hid.u32Limit;            \
         pVMCB->guest.REG.u64Base  = pCtx->reg##Hid.u64Base;             \
-        pVMCB->guest.REG.u16Attr  = SVM_HIDSEGATTR_VMX2SVM(pCtx->reg##Hid.Attr.u);
+        pVMCB->guest.REG.u16Attr  = SVM_HIDSEGATTR_VMX2SVM(pCtx->reg##Hid.Attr.u); \
+}
 
 #define SVM_READ_SELREG(REG, reg)                                       \
+{                                                                       \
         pCtx->reg                = pVMCB->guest.REG.u16Sel;             \
         pCtx->reg##Hid.u32Limit  = pVMCB->guest.REG.u32Limit;           \
         pCtx->reg##Hid.u64Base   = pVMCB->guest.REG.u64Base;            \
-        pCtx->reg##Hid.Attr.u    = SVM_HIDSEGATTR_SVM2VMX(pVMCB->guest.REG.u16Attr);
+        pCtx->reg##Hid.Attr.u    = SVM_HIDSEGATTR_SVM2VMX(pVMCB->guest.REG.u16Attr); \
+}
 
 #endif /* IN_RING0 */

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

@@ -1556 +1556 @@
     /* In real mode we have a fake TSS, so only sync it back when it's supposed to be valid. */
     if (pCtx->cr0 & X86_CR0_PROTECTION_ENABLE)
+    {
         VMX_READ_SELREG(TR, tr);
+    }
+    else
+        /* Force a TR resync every time in case we switch modes. */
+        pVM->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_GUEST_TR;
 
     VMXReadVMCS(VMX_VMCS_GUEST_GDTR_LIMIT,       &val);

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

@@ -138 +138 @@
 
 #define VMX_WRITE_SELREG(REG, reg) \
+{                                                                                               \
         rc  = VMXWriteVMCS(VMX_VMCS_GUEST_FIELD_##REG,      pCtx->reg);                         \
         rc |= VMXWriteVMCS(VMX_VMCS_GUEST_##REG##_LIMIT,    pCtx->reg##Hid.u32Limit);           \
@@ -149 +150 @@
             val = 0x10000;  /* Invalid guest state error otherwise. (BIT(16) = Unusable) */     \
                                                                                                 \
-        rc |= VMXWriteVMCS(VMX_VMCS_GUEST_##REG##_ACCESS_RIGHTS, val);
+        rc |= VMXWriteVMCS(VMX_VMCS_GUEST_##REG##_ACCESS_RIGHTS, val);                          \
+}
 
 #define VMX_READ_SELREG(REG, reg) \
+{                                                                    \
         VMXReadVMCS(VMX_VMCS_GUEST_FIELD_##REG,           &val);     \
         pCtx->reg                = val;                              \
@@ -159 +162 @@
         pCtx->reg##Hid.u64Base     = val;                            \
         VMXReadVMCS(VMX_VMCS_GUEST_##REG##_ACCESS_RIGHTS, &val);     \
-        pCtx->reg##Hid.Attr.u    = val;
+        pCtx->reg##Hid.Attr.u    = val;                              \
+}
 
 #define VMX_LOG_SELREG(REG, szSelReg) \
+{                                                                    \
         VMXReadVMCS(VMX_VMCS_GUEST_FIELD_##REG,           &val);     \
         Log(("%s Selector     %x\n", szSelReg, val));                \
@@ -169 +174 @@
         Log(("%s Base         %RX64\n", szSelReg, val));             \
         VMXReadVMCS(VMX_VMCS_GUEST_##REG##_ACCESS_RIGHTS, &val);     \
-        Log(("%s Attributes   %x\n", szSelReg, val));
+        Log(("%s Attributes   %x\n", szSelReg, val));                \
+}