Changeset 47802 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 16, 2013 11:27:27 AM (12 years ago)

Author:

vboxsync

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

88063

Message:

VMM/HM: Redundant updates of flags is not necessary.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

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

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

@@ -1408 +1408 @@
     AssertPtr(pCpu);
 
-    pVCpu->hm.s.idEnteredCpu = idCpu;
-
-    /* Reload the host context and the guest's CR0 register for the FPU bits. */
-    pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR0 | HM_CHANGED_HOST_CONTEXT;
-
     /* Enable VT-x or AMD-V if local init is required, or enable if it's a freshly onlined CPU. */
     if (   !pCpu->fConfigured
@@ -1419 +1414 @@
         hmR0EnableCpu(pVCpu->CTX_SUFF(pVM), idCpu);
     }
+
+    /* Reload host-context (back from ring-3/migrated CPUs), reload guest CR0 (for FPU bits). */
+    pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_HOST_CONTEXT | HM_CHANGED_GUEST_CR0;
+    pVCpu->hm.s.idEnteredCpu = idCpu;
 }
 
@@ -1451 +1450 @@
     Assert(pCpu);
     Assert(pCtx);
+    Assert(pVCpu->hm.s.fContextUseFlags & (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_GUEST_CR0));
 
     int rc  = g_HvmR0.pfnEnterSession(pVM, pVCpu, pCpu);

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

@@ -1618 +1618 @@
                initializing AMD-V if necessary (onlined CPUs, local init etc.) */
             HMR0EnterEx(pVCpu);
-
-            pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_HOST_CONTEXT;
+            Assert(pVCpu->hm.s.fContextUseFlags & (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_GUEST_CR0));
 
             RTThreadPreemptRestore(&PreemptState);

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

@@ -6844 +6844 @@
                initializing VT-x if necessary (onlined CPUs, local init etc.) */
             HMR0EnterEx(pVCpu);
+            Assert(pVCpu->hm.s.fContextUseFlags & (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_GUEST_CR0));
 
             /* Load the active VMCS as the current one. */
@@ -6851 +6852 @@
             pVCpu->hm.s.fResumeVM  = false;
             pVCpu->hm.s.fLeaveDone = false;
-            pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_HOST_CONTEXT;
 
             /* Restore preemption, migrating to another CPU should be fine now. */