Changeset 48454 in vbox for trunk/src/VBox

Timestamp:

Sep 12, 2013 4:07:31 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: oops.

File:

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

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

@@ -8014 +8014 @@
          * CR0.
          */
-        uint32_t u32GuestCR0;
         uint32_t uSetCR0 = (uint32_t)(pVM->hm.s.vmx.Msrs.u64Cr0Fixed0 & pVM->hm.s.vmx.Msrs.u64Cr0Fixed1);
         uint32_t uZapCR0 = (uint32_t)(pVM->hm.s.vmx.Msrs.u64Cr0Fixed0 | pVM->hm.s.vmx.Msrs.u64Cr0Fixed1);
@@ -8022 +8021 @@
             uSetCR0 &= ~(X86_CR0_PE | X86_CR0_PG);
 
+        uint32_t u32GuestCR0;
         rc = VMXReadVmcs32(VMX_VMCS_GUEST_CR0, &u32GuestCR0);
         AssertRCBreak(rc);
-        HMVMX_CHECK_BREAK((u32Val & uSetCR0) == uSetCR0, VMX_IGS_CR0_FIXED1);
-        HMVMX_CHECK_BREAK(!(u32Val & ~uZapCR0), VMX_IGS_CR0_FIXED0);
+        HMVMX_CHECK_BREAK((u32GuestCR0 & uSetCR0) == uSetCR0, VMX_IGS_CR0_FIXED1);
+        HMVMX_CHECK_BREAK(!(u32GuestCR0 & ~uZapCR0), VMX_IGS_CR0_FIXED0);
         if (   !fUnrestrictedGuest
             && (u32GuestCR0 & X86_CR0_PG)
@@ -8036 +8036 @@
          * CR4.
          */
-        uint32_t u32GuestCR4;
         uint64_t uSetCR4 = (pVM->hm.s.vmx.Msrs.u64Cr4Fixed0 & pVM->hm.s.vmx.Msrs.u64Cr4Fixed1);
         uint64_t uZapCR4 = (pVM->hm.s.vmx.Msrs.u64Cr4Fixed0 | pVM->hm.s.vmx.Msrs.u64Cr4Fixed1);
+
+        uint32_t u32GuestCR4;
         rc = VMXReadVmcs32(VMX_VMCS_GUEST_CR4, &u32GuestCR4);
         AssertRCBreak(rc);