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

Timestamp:

Sep 14, 2018 4:20:16 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM, CPUM: Nested VMX: bugref:9180 vmlaunch/vmresume bits.

File:

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

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

@@ -931 +931 @@
             pVCpu->cpum.s.Guest.hwvirt.vmx.pvVmwriteBitmapR3 = NULL;
         }
+        if (pVCpu->cpum.s.Guest.hwvirt.vmx.pAutoMsrAreaR3)
+        {
+            SUPR3PageFreeEx(pVCpu->cpum.s.Guest.hwvirt.vmx.pAutoMsrAreaR3, VMX_V_AUTOMSR_AREA_PAGES);
+            pVCpu->cpum.s.Guest.hwvirt.vmx.pAutoMsrAreaR3 = NULL;
+        }
     }
 }
@@ -952 +957 @@
          * Allocate the nested-guest current VMCS.
          */
-        SUPPAGE SupNstGstVmcsPage;
-        RT_ZERO(SupNstGstVmcsPage);
-        SupNstGstVmcsPage.Phys = NIL_RTHCPHYS;
         Assert(VMX_V_VMCS_PAGES == 1);
         Assert(!pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR3);
         rc = SUPR3PageAllocEx(VMX_V_VMCS_PAGES, 0 /* fFlags */, (void **)&pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR3,
-                              &pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR0, &SupNstGstVmcsPage);
+                              &pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR0, NULL /* paPages */);
         if (RT_FAILURE(rc))
         {
@@ -1006 +1008 @@
             LogRel(("CPUM%u: Failed to alloc %u pages for the nested-guest's VMWRITE-bitmap\n", pVCpu->idCpu,
                     VMX_V_VMREAD_VMWRITE_BITMAP_PAGES));
+            break;
+        }
+
+        /*
+         * Allocate the MSR auto-load/store area.
+         */
+        Assert(!pVCpu->cpum.s.Guest.hwvirt.vmx.pAutoMsrAreaR3);
+        rc = SUPR3PageAllocEx(VMX_V_AUTOMSR_AREA_PAGES, 0 /* fFlags */,
+                              (void **)&pVCpu->cpum.s.Guest.hwvirt.vmx.pAutoMsrAreaR3,
+                              &pVCpu->cpum.s.Guest.hwvirt.vmx.pAutoMsrAreaR0, NULL /* paPages */);
+        if (RT_FAILURE(rc))
+        {
+            Assert(!pVCpu->cpum.s.Guest.hwvirt.vmx.pAutoMsrAreaR3);
+            LogRel(("CPUM%u: Failed to alloc %u pages for the nested-guest's auto-load/store MSR area\n", pVCpu->idCpu,
+                    VMX_V_AUTOMSR_AREA_PAGES));
             break;
         }