Changeset 2897 in vbox for trunk/src/VBox

Timestamp:

May 28, 2007 2:06:00 PM (18 years ago)

Author:

vboxsync

Message:

Correct eflags.IOPL as well.

File:

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

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

@@ -547 +547 @@
     int         rc = VINF_SUCCESS;
     RTGCUINTPTR val;
+    X86EFLAGS   eflags;
 
     /* Guest CPU context: ES, CS, SS, DS, FS, GS. */
@@ -776 +777 @@
 
     /* Bits 22-31, 15, 5 & 3 must be zero. Bit 1 must be 1. */
-    val  = pCtx->eflags.u32;
-    val &= VMX_EFLAGS_RESERVED_0;
-    val |= VMX_EFLAGS_RESERVED_1;
+    eflags      = pCtx->eflags;
+    eflags.u32 &= VMX_EFLAGS_RESERVED_0;
+    eflags.u32 |= VMX_EFLAGS_RESERVED_1;
 
     /* 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_EFL_VM;
-        if (pCtx->eflags.Bits.u1IF)
-            val |= X86_EFL_VIF;
-        else
-            val &= ~X86_EFL_VIF;
-    }
-
-    rc   = VMXWriteVMCS(VMX_VMCS_GUEST_RFLAGS,           val);
+        eflags.Bits.u1VM   = 1;
+        eflags.Bits.u1VIF  = pCtx->eflags.Bits.u1IF;
+        eflags.Bits.u2IOPL = 3;
+    }
+
+    rc   = VMXWriteVMCS(VMX_VMCS_GUEST_RFLAGS,           eflags.u32);
     AssertRC(rc);
 
@@ -1209 +1208 @@
     {
         /* Hide our emulation flags */
-        pCtx->eflags.Bits.u1VM  = 0;
-        pCtx->eflags.Bits.u1IF  = pCtx->eflags.Bits.u1VIF;
-        pCtx->eflags.Bits.u1VIF = 0;
+        pCtx->eflags.Bits.u1VM   = 0;
+        pCtx->eflags.Bits.u1IF   = pCtx->eflags.Bits.u1VIF;
+        pCtx->eflags.Bits.u1VIF  = 0;
+        pCtx->eflags.Bits.u2IOPL = 0;
     }