Changeset 96902 in vbox for trunk/src/VBox/VMM/VMMR3/CPUM.cpp

Timestamp:

Sep 27, 2022 2:30:57 PM (2 years ago)

Author:

vboxsync

Message:

VMM: Nested SVM: bugref:7243 VM reset and init. nits for nested SVM, don't rely on order of usage assumptions.

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -1049 +1049 @@
         AssertCompile(sizeof(pCtx->hwvirt.svm.abMsrBitmap) == SVM_MSRPM_PAGES * X86_PAGE_SIZE);
         AssertCompile(sizeof(pCtx->hwvirt.svm.abIoBitmap) == SVM_IOPM_PAGES * X86_PAGE_SIZE);
+
+        /* Initialize non-zero values. */
+        pCtx->hwvirt.svm.GCPhysVmcb = NIL_RTGCPHYS;
     }
 }
@@ -1064 +1067 @@
 
     RT_ZERO(pCtx->hwvirt.svm.Vmcb);
-    pCtx->hwvirt.svm.uMsrHSavePa    = 0;
-    pCtx->hwvirt.svm.uPrevPauseTick = 0;
+    RT_ZERO(pCtx->hwvirt.svm.HostState);
+    RT_ZERO(pCtx->hwvirt.svm.abMsrBitmap);
+    RT_ZERO(pCtx->hwvirt.svm.abIoBitmap);
+
+    pCtx->hwvirt.svm.uMsrHSavePa           = 0;
+    pCtx->hwvirt.svm.uPrevPauseTick        = 0;
+    pCtx->hwvirt.svm.GCPhysVmcb            = NIL_RTGCPHYS;
+    pCtx->hwvirt.svm.cPauseFilter          = 0;
+    pCtx->hwvirt.svm.cPauseFilterThreshold = 0;
+    pCtx->hwvirt.svm.fInterceptEvents      = false;
 }