Changeset 48566 in vbox for trunk/src/VBox/VMM/VMMR0/HMR0.cpp

Timestamp:

Sep 19, 2013 10:16:57 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMR0: Start using the HM-context flags macros slowly.

File:

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

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

@@ -1350 +1350 @@
     /* On first entry we'll sync everything. */
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
-        pVM->aCpus[i].hm.s.fContextUseFlags = (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_ALL_GUEST);
+        VMCPU_HMCF_RESET_TO(&pVM->aCpus[i], HM_CHANGED_HOST_CONTEXT | HM_CHANGED_ALL_GUEST);
 
     /* Enable VT-x or AMD-V if local init is required. */
@@ -1398 +1398 @@
 
     /* Reload host-context (back from ring-3/migrated CPUs), reload host context & shared bits. */
-    pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_HOST_CONTEXT | HM_CHANGED_HOST_GUEST_SHARED_STATE;
+    VMCPU_HMCF_SET(pVCpu, HM_CHANGED_HOST_CONTEXT | HM_CHANGED_HOST_GUEST_SHARED_STATE);
     pVCpu->hm.s.idEnteredCpu = idCpu;
     return rc;
@@ -1433 +1433 @@
     Assert(pCpu);
     Assert(pCtx);
-    Assert(pVCpu->hm.s.fContextUseFlags & (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_HOST_GUEST_SHARED_STATE));
+    Assert(VMCPU_HMCF_IS_PENDING(pVCpu, HM_CHANGED_HOST_CONTEXT | HM_CHANGED_HOST_GUEST_SHARED_STATE));
 
     rc = g_HvmR0.pfnEnterSession(pVM, pVCpu, pCpu);