Changeset 45413 in vbox

Timestamp:

Apr 8, 2013 8:15:01 PM (12 years ago)

Author:

vboxsync

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

84841

Message:

VMM/VMMR0: HM bits.

File:

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

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

@@ -2795 +2795 @@
             Log(("VMX_VMCS64_CTRL_EPTP_FULL=%#RX64\n", pVCpu->hm.s.vmx.GCPhysEPTP));
 
-            if (   CPUMIsGuestPagingEnabledEx(pCtx)
-                || pVM->hm.s.vmx.fUnrestrictedGuest)
+            if (   pVM->hm.s.vmx.fUnrestrictedGuest
+                || CPUMIsGuestPagingEnabledEx(pCtx))
             {
                 /* If the guest is in PAE mode, pass the PDPEs to VT-x using the VMCS fields. */
                 if (CPUMIsGuestInPAEModeEx(pCtx))
                 {
-                    rc = PGMGstGetPaePdpes(pVCpu, &pVCpu->hm.s.aPdpes[0]);
+                    rc  = PGMGstGetPaePdpes(pVCpu, &pVCpu->hm.s.aPdpes[0]);
                     rc |= VMXWriteVmcs64(VMX_VMCS64_GUEST_PDPTE0_FULL, pVCpu->hm.s.aPdpes[0].u);
                     rc |= VMXWriteVmcs64(VMX_VMCS64_GUEST_PDPTE1_FULL, pVCpu->hm.s.aPdpes[1].u);
@@ -5267 +5267 @@
         return VINF_SUCCESS;
 
-    VMMRZCallRing3Disable(pVCpu);   /* We're not using hmR0VmxCallRing3Disable() as we want to respect nesting here. */
+    VMMRZCallRing3Disable(pVCpu);
 
     int rc = hmR0VmxSaveGuestGprs(pVM, pVCpu, pMixedCtx);
@@ -7532 +7532 @@
         case VMX_EXIT_QUALIFICATION_CRX_ACCESS_CLTS:        /* CLTS (Clear Task-Switch Flag in CR0) */
         {
-            rc  = hmR0VmxSaveGuestCR0(pVM, pVCpu, pMixedCtx);
-            rc |= EMInterpretCLTS(pVM, pVCpu);
+            rc = hmR0VmxSaveGuestCR0(pVM, pVCpu, pMixedCtx);
+            AssertRCReturn(rc, rc);
+            rc = EMInterpretCLTS(pVM, pVCpu);
             AssertRCReturn(rc, rc);
             pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR0;
@@ -7543 +7544 @@
         case VMX_EXIT_QUALIFICATION_CRX_ACCESS_LMSW:        /* LMSW (Load Machine-Status Word into CR0) */
         {
-            rc  = hmR0VmxSaveGuestCR0(pVM, pVCpu, pMixedCtx);
+            rc = hmR0VmxSaveGuestCR0(pVM, pVCpu, pMixedCtx);
             AssertRCReturn(rc, rc);
             rc = EMInterpretLMSW(pVM, pVCpu, CPUMCTX2CORE(pMixedCtx), VMX_EXIT_QUALIFICATION_CRX_LMSW_DATA(uExitQualification));