Changeset 68329 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Aug 8, 2017 8:09:01 AM (7 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Nested Hw.virt fixes.

File:

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

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

@@ -805 +805 @@
         Assert(!pVCpu->cpum.s.Guest.hwvirt.svm.pVmcbR3);
         rc = SUPR3PageAllocEx(SVM_VMCB_PAGES, 0 /* fFlags */, (void **)&pVCpu->cpum.s.Guest.hwvirt.svm.pVmcbR3,
-                              (PRTR0PTR)pVCpu->cpum.s.Guest.hwvirt.svm.pVmcbR0, NULL /* paPages */);
+                              &pVCpu->cpum.s.Guest.hwvirt.svm.pVmcbR0, NULL /* paPages */);
         if (RT_FAILURE(rc))
         {
@@ -1269 +1269 @@
      */
     /* SVM. */
-    memset(&pCtx->hwvirt.svm, 0, sizeof(pCtx->hwvirt.svm));
+    memset(pCtx->hwvirt.svm.CTX_SUFF(pVmcb), 0, sizeof(SVMVMCB));
+    pCtx->hwvirt.svm.uMsrHSavePa = 0;
+    pCtx->hwvirt.svm.GCPhysVmcb = 0;
     pCtx->hwvirt.svm.fGif = 1;
 }