Changeset 62431 in vbox

Timestamp:

Jul 22, 2016 11:43:29 AM (8 years ago)

Author:

vboxsync

Message:

VMMR0: MSC level 4 warning fixes.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (1 diff)
• HMVMXR0.cpp (modified) (3 diffs)

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

@@ -3754 +3754 @@
         }
     }
-    return VERR_INTERNAL_ERROR_5;   /* Should never happen. */
+    /* not reached */
 }
 

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

@@ -795 +795 @@
 
     /* Enable the VMX bit in CR4 if necessary. */
-    RTCCUINTREG uOldCr4 = SUPR0ChangeCR4(X86_CR4_VMXE, ~0);
+    RTCCUINTREG uOldCr4 = SUPR0ChangeCR4(X86_CR4_VMXE, RTCCUINTREG_MAX);
 
     /* Enter VMX root mode. */
@@ -13298 +13298 @@
                 RTGCPTR   GCPtrStack = 0;
                 X86EFLAGS Eflags;
+                Eflags.u32 = 0;
                 rc = SELMToFlatEx(pVCpu, DISSELREG_SS, CPUMCTX2CORE(pMixedCtx), pMixedCtx->esp & uMask, SELMTOFLAT_FLAGS_CPL0,
                                   &GCPtrStack);
@@ -13303 +13304 @@
                 {
                     Assert(sizeof(Eflags.u32) >= cbParm);
-                    Eflags.u32 = 0;
                     rc = VBOXSTRICTRC_TODO(PGMPhysRead(pVM, (RTGCPHYS)GCPtrStack, &Eflags.u32, cbParm, PGMACCESSORIGIN_HM));
                     AssertMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc)); /** @todo allow strict return codes here */