Changeset 80871 in vbox for trunk/src/VBox

Timestamp:

Sep 17, 2019 5:41:42 PM (6 years ago)

Author:

vboxsync

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

133442

Message:

VMM/HM: Explicit cast to 64-bit while flipping X86_CR4_VMXE.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMR0.cpp (modified) (1 diff)
• HMVMXR0.cpp (modified) (2 diffs)

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

@@ -448 +448 @@
             /* Restore CR4.VMXE if it wasn't set prior to us setting it above. */
             if (!(uOldCr4 & X86_CR4_VMXE))
-                SUPR0ChangeCR4(0 /* fOrMask */, ~X86_CR4_VMXE);
+                SUPR0ChangeCR4(0 /* fOrMask */, ~(uint64_t)X86_CR4_VMXE);
 
             /* Restore interrupts. */

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

@@ -1621 +1621 @@
         /* Restore CR4.VMXE if it was not set prior to our attempt to set it above. */
         if (!(uOldCr4 & X86_CR4_VMXE))
-            SUPR0ChangeCR4(0 /* fOrMask */, ~X86_CR4_VMXE);
+            SUPR0ChangeCR4(0 /* fOrMask */, ~(uint64_t)X86_CR4_VMXE);
 
         if (pVM)
@@ -1653 +1653 @@
         /* Exit VMX root mode and clear the VMX bit in CR4. */
         VMXDisable();
-        SUPR0ChangeCR4(0 /* fOrMask */, ~X86_CR4_VMXE);
+        SUPR0ChangeCR4(0 /* fOrMask */, ~(uint64_t)X86_CR4_VMXE);
         rc = VINF_SUCCESS;
     }