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

Timestamp:

Dec 15, 2009 10:26:53 AM (15 years ago)

Author:

vboxsync

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

56011

Message:

Initial commit for unrestricted guest execution support (VT-x)

File:

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

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

@@ -754 +754 @@
 
 #ifdef HWACCM_VMX_EMULATE_REALMODE
-    if (CPUMIsGuestInRealModeEx(pCtx))
+    if (    CPUMIsGuestInRealModeEx(pCtx)
+        &&  pVM->hwaccm.s.vmx.pRealModeTSS)
     {
         RTGCPHYS GCPhysHandler;
@@ -1291 +1292 @@
 # ifdef HWACCM_VMX_EMULATE_REALMODE
     /* Intercept all exceptions in real mode as none of them can be injected directly (#GP otherwise). */
-    if (CPUMIsGuestInRealModeEx(pCtx) && pVM->hwaccm.s.vmx.pRealModeTSS)
+    if (    CPUMIsGuestInRealModeEx(pCtx) 
+        &&  pVM->hwaccm.s.vmx.pRealModeTSS)
         u32TrapMask |= HWACCM_VMX_TRAP_MASK_REALMODE;
 # endif /* HWACCM_VMX_EMULATE_REALMODE */
@@ -1473 +1475 @@
 #ifdef HWACCM_VMX_EMULATE_REALMODE
         /* Real mode emulation using v86 mode with CR4.VME (interrupt redirection using the int bitmap in the TSS) */
-        if (CPUMIsGuestInRealModeEx(pCtx))
+        if (    CPUMIsGuestInRealModeEx(pCtx)
+            &&  pVM->hwaccm.s.vmx.pRealModeTSS)
         {
             RTGCPHYS GCPhys;
@@ -1648 +1651 @@
         }
 
+#ifdef HWACCM_VMX_EMULATE_REALMODE
         /* Turn off VME if we're in emulated real mode. */
-        if (CPUMIsGuestInRealModeEx(pCtx))
+        if (    CPUMIsGuestInRealModeEx(pCtx)
+            &&  !pVM->hwaccm.s.vmx.pRealModeTSS)
             val &= ~X86_CR4_VME;
+#endif /* HWACCM_VMX_EMULATE_REALMODE */
 
         rc |= VMXWriteVMCS64(VMX_VMCS64_GUEST_CR4,            val);
@@ -1787 +1793 @@
 #ifdef HWACCM_VMX_EMULATE_REALMODE
     /* Real mode emulation using v86 mode. */
-    if (CPUMIsGuestInRealModeEx(pCtx))
+    if (    CPUMIsGuestInRealModeEx(pCtx)
+        &&  pVM->hwaccm.s.vmx.pRealModeTSS)
     {
         pVCpu->hwaccm.s.vmx.RealMode.eflags = eflags;
@@ -2017 +2024 @@
 #ifdef HWACCM_VMX_EMULATE_REALMODE
     /* Real mode emulation using v86 mode. */
-    if (CPUMIsGuestInRealModeEx(pCtx))
+    if (    CPUMIsGuestInRealModeEx(pCtx)
+        &&  pVM->hwaccm.s.vmx.pRealModeTSS)
     {
         /* Hide our emulation flags */
@@ -3018 +3026 @@
                 STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitGuestGP);
 #ifdef VBOX_STRICT
-                if (!CPUMIsGuestInRealModeEx(pCtx))
+                if (    !CPUMIsGuestInRealModeEx(pCtx)
+                    ||  !pVM->hwaccm.s.vmx.pRealModeTSS)
                 {
                     Log(("Trap %x at %04X:%RGv errorCode=%x\n", vector, pCtx->cs, (RTGCPTR)pCtx->rip, errCode));
@@ -3289 +3298 @@
             default:
 #ifdef HWACCM_VMX_EMULATE_REALMODE
-                if (CPUMIsGuestInRealModeEx(pCtx))
+                if (    CPUMIsGuestInRealModeEx(pCtx)
+                    &&  pVM->hwaccm.s.vmx.pRealModeTSS)
                 {
                     Log(("Real Mode Trap %x at %04x:%04X error code %x\n", vector, pCtx->cs, pCtx->eip, errCode));