Changeset 12746 in vbox

Timestamp:

Sep 25, 2008 3:18:01 PM (16 years ago)

Author:

vboxsync

Message:

Bitmap corrections.

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (2 diffs)
• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -522 +522 @@
 
             /* Allocate three pages for the TSS we need for real mode emulation. (2 page for the IO bitmap) */
-            rc = PDMR3VMMDevHeapAlloc(pVM, sizeof(*pVM->hwaccm.s.vmx.pRealModeTSS) + 2*PAGE_SIZE, (RTR3PTR *)&pVM->hwaccm.s.vmx.pRealModeTSS);
+            rc = PDMR3VMMDevHeapAlloc(pVM, HWACCM_VTX_TSS_SIZE, (RTR3PTR *)&pVM->hwaccm.s.vmx.pRealModeTSS);
             AssertRC(rc);
             if (RT_FAILURE(rc))
@@ -533 +533 @@
             memset(pVM->hwaccm.s.vmx.pRealModeTSS->IntRedirBitmap, 0x0, sizeof(pVM->hwaccm.s.vmx.pRealModeTSS->IntRedirBitmap));
             /* Allow all port IO, so the VT-x IO intercepts do their job. */
-            memset(pVM->hwaccm.s.vmx.pRealModeTSS + 1, 0xff, PAGE_SIZE*2);
+            memset(pVM->hwaccm.s.vmx.pRealModeTSS + 1, 0, PAGE_SIZE*2);
+            *((unsigned char *)pVM->hwaccm.s.vmx.pRealModeTSS + HWACCM_VTX_TSS_SIZE - 2) = 0xff;
 
             rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_HWACC_SETUP_VM, 0, NULL);

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -121 +121 @@
 /** Maxium resume loops allowed in ring 0 (safety precaution) */
 #define HWACCM_MAX_RESUME_LOOPS             1024
+
+/** Size of the TSS structure + 2 pages for the IO bitmap + end byte. */
+#define HWACCM_VTX_TSS_SIZE                 (sizeof(VBOXTSS) + 2*PAGE_SIZE + 1)
 
 /** HWACCM SSM version

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

@@ -794 +794 @@
 
             rc =  VMXWriteVMCS(VMX_VMCS_GUEST_FIELD_TR,         0);
-            rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_LIMIT,         sizeof(VBOXTSS) + 2*PAGE_SIZE);
+            rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_LIMIT,         HWACCM_VTX_TSS_SIZE);
             rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_BASE,          GCPhys /* phys = virt in this mode */);