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

Timestamp:

Sep 24, 2008 2:54:14 PM (17 years ago)

Author:

vboxsync

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

36998

Message:

Backed out paging changes (36990/86/83).

Location:

trunk/src/VBox/VMM/VMMR0

Files:

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

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

@@ -655 +655 @@
             switch(pVM->hwaccm.s.enmShadowMode)
             {
+            case PGMMODE_REAL:
+            case PGMMODE_PROTECTED:     /* Protected mode, no paging. */
+                AssertFailed();
+                return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
+
             case PGMMODE_32_BIT:        /* 32-bit paging. */
                 break;
@@ -673 +678 @@
 #endif
 
-            case PGMMODE_REAL:          /* Real mode                 -> emulated using v86 mode */
-            case PGMMODE_PROTECTED:     /* Protected mode, no paging -> emulated using identity mapping. */
             default:                    /* shut up gcc */
                 AssertFailed();

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

@@ -788 +788 @@
             rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_LIMIT,         sizeof(VBOXTSS));
             rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_BASE,          GCPhys /* phys = virt in this mode */);
-
-            val = X86_DESC_P | X86_SEL_TYPE_SYS_386_TSS_BUSY;
         }
         else
@@ -795 +793 @@
             rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_LIMIT,         pCtx->trHid.u32Limit);
             rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_BASE,          pCtx->trHid.u64Base);
-
-            val = pCtx->trHid.Attr.u;
-
-            /* The TSS selector must be busy. */
-            if ((val & 0xF) == X86_SEL_TYPE_SYS_286_TSS_AVAIL)
-                val = (val & ~0xF) | X86_SEL_TYPE_SYS_286_TSS_BUSY;
-            else
-                /* Default even if no TR selector has been set (otherwise vmlaunch will fail!) */
-                val = (val & ~0xF) | X86_SEL_TYPE_SYS_386_TSS_BUSY;
-        }
+        }
+        val = pCtx->trHid.Attr.u;
+
+        /* The TSS selector must be busy. */
+        if ((val & 0xF) == X86_SEL_TYPE_SYS_286_TSS_AVAIL)
+            val = (val & ~0xF) | X86_SEL_TYPE_SYS_286_TSS_BUSY;
+        else
+            /* Default even if no TR selector has been set (otherwise vmlaunch will fail!) */
+            val = (val & ~0xF) | X86_SEL_TYPE_SYS_386_TSS_BUSY;
 
         rc |= VMXWriteVMCS(VMX_VMCS_GUEST_TR_ACCESS_RIGHTS, val);
@@ -899 +896 @@
         switch(pVM->hwaccm.s.enmShadowMode)
         {
+        case PGMMODE_REAL:          /* Real mode                 -> emulated using v86 mode */
+        case PGMMODE_PROTECTED:     /* Protected mode, no paging -> emulated using identity mapping. */
         case PGMMODE_32_BIT:        /* 32-bit paging. */
             break;
@@ -916 +915 @@
             return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
 #endif
-        case PGMMODE_REAL:          /* Real mode                 -> emulated using v86 mode */
-        case PGMMODE_PROTECTED:     /* Protected mode, no paging -> emulated using identity mapping. */
-        default:                    /* shut up gcc */
+        default:                   /* shut up gcc */
             AssertFailed();
             return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
         }
-        /* Real mode emulation using v86 mode with CR4.VME (interrupt redirection using the int bitmap in the TSS and VIF support) */
+        /* Real mode emulation using v86 mode with CR4.VME (interrupt redirection using the int bitmap in the TSS) */
         if (!(pCtx->cr0 & X86_CR0_PROTECTION_ENABLE))
             val |= X86_CR4_VME;
@@ -928 +925 @@
         rc |= VMXWriteVMCS(VMX_VMCS_GUEST_CR4,              val);
         Log2(("Guest CR4 %08x\n", val));
-        /* All CR4 flags owned by the host; if the guests attempts to change them, then
+        /* CR4 flags owned by the host; if the guests attempts to change them, then
          * the VM will exit.
          */
-        pVM->hwaccm.s.vmx.cr4_mask = ~0;
-
-        rc |= VMXWriteVMCS(VMX_VMCS_CTRL_CR4_MASK, pVM->hwaccm.s.vmx.cr4_mask);
+        val =   X86_CR4_PAE
+              | X86_CR4_PGE
+              | X86_CR4_PSE
+              | X86_CR4_VMXE;
+        pVM->hwaccm.s.vmx.cr4_mask = val;
+
+        rc |= VMXWriteVMCS(VMX_VMCS_CTRL_CR4_MASK, val);
         Log2(("Guest CR4-mask %08x\n", val));
         AssertRC(rc);