Changeset 66045 in vbox

Timestamp:

Mar 10, 2017 4:57:15 PM (8 years ago)

Author:

vboxsync

Message:

VMM: Nested Hw.virt: Read strictly what we need into VMCPU, dealing with conservative stack sizes.

File:

• trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp

@@ -193 +193 @@
     pCtx->hwvirt.svm.GCPhysVmcb = GCPhysVmcb;
 
-#if 0
-    SVMVMCB Vmcb;
+    /*
+     * Cache the VMCB controls.
+     */
     PVM pVM = pVCpu->CTX_SUFF(pVM);
-    //int rc = PGMPhysSimpleReadGCPhys(pVM, &Vmcb, GCPhysVmcb, X86_PAGE_4K_SIZE);
-    int rc = VINF_SUCCESS;
+    int rc = PGMPhysSimpleReadGCPhys(pVM, &pCtx->hwvirt.svm.VmcbCtrl, GCPhysVmcb, sizeof(pCtx->hwvirt.svm.VmcbCtrl));
     if (RT_SUCCESS(rc))
     {
@@ -220 +220 @@
 
         /*
-         * Cache the VMCB controls.
-         */
-        pCtx->hwvirt.svm.VmcbCtrl = Vmcb.ctrl;
-
-        /*
          * Validate the VMCB controls.
          */
@@ -250 +245 @@
 
     return rc;
-#endif
-    return VERR_NOT_IMPLEMENTED;
-
 }