Changeset 72910 in vbox for trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

Timestamp:

Jul 5, 2018 8:56:37 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Remove confusing HMSVM_SYNC_FULL_NESTED_GUEST_STATE option. Figure out if it's needed later.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (6 diffs)

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

@@ -39 +39 @@
 #ifdef DEBUG_ramshankar
 # define HMSVM_SYNC_FULL_GUEST_STATE
-# define HMSVM_SYNC_FULL_NESTED_GUEST_STATE
 # define HMSVM_ALWAYS_TRAP_ALL_XCPTS
 # define HMSVM_ALWAYS_TRAP_PF
@@ -4367 +4366 @@
     }
 
-#ifdef HMSVM_SYNC_FULL_NESTED_GUEST_STATE
+#ifdef HMSVM_SYNC_FULL_GUEST_STATE
     Assert(!(pCtx->fExtrn & HMSVM_CPUMCTX_EXTRN_ALL));
     ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_ALL_GUEST);
@@ -4472 +4471 @@
 
 #ifdef HMSVM_SYNC_FULL_GUEST_STATE
-    if (!CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-    {
-        Assert(!(pCtx->fExtrn & HMSVM_CPUMCTX_EXTRN_ALL));
-        ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_ALL_GUEST);
-    }
+    Assert(!(pCtx->fExtrn & HMSVM_CPUMCTX_EXTRN_ALL));
+    ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_ALL_GUEST);
 #endif
 
@@ -4797 +4793 @@
 
 #ifdef HMSVM_SYNC_FULL_GUEST_STATE
-    if (!CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-        hmR0SvmImportGuestState(pVCpu, HMSVM_CPUMCTX_EXTRN_ALL);
-#elif defined(HMSVM_SYNC_FULL_NESTED_GUEST_STATE)
-    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-        hmR0SvmImportGuestState(pVCpu, HMSVM_CPUMCTX_EXTRN_ALL);
+    hmR0SvmImportGuestState(pVCpu, HMSVM_CPUMCTX_EXTRN_ALL);
+    Assert(!(pCtx->fExtrn & HMSVM_CPUMCTX_EXTRN_ALL));
 #else
     /*
@@ -4826 +4819 @@
 #endif
 
-#ifdef DEBUG_ramshankar
-    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-    {
-        hmR0SvmImportGuestState(pVCpu, HMSVM_CPUMCTX_EXTRN_ALL);
-        hmR0SvmLogState(pVCpu, pVmcb, pCtx, "hmR0SvmPostRunGuestNested", HMSVM_LOG_ALL & ~HMSVM_LOG_LBR, 0 /* uVerbose */);
-    }
-#endif
-
     if (   pSvmTransient->u64ExitCode != SVM_EXIT_INVALID
         && pVCpu->hm.s.svm.fSyncVTpr)
@@ -4854 +4839 @@
         }
     }
+
+#ifdef DEBUG_ramshankar
+    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
+    {
+        hmR0SvmImportGuestState(pVCpu, HMSVM_CPUMCTX_EXTRN_ALL);
+        hmR0SvmLogState(pVCpu, pVmcb, pCtx, "hmR0SvmPostRunGuestNested", HMSVM_LOG_ALL & ~HMSVM_LOG_LBR, 0 /* uVerbose */);
+    }
+#endif
 
     HMSVM_CPUMCTX_ASSERT(pVCpu, CPUMCTX_EXTRN_CS | CPUMCTX_EXTRN_RIP);