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

Timestamp:

Sep 3, 2018 4:10:27 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

124803

Message:

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

File:

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

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

@@ -916 +916 @@
             pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR3 = NULL;
         }
+        if (pVCpu->cpum.s.Guest.hwvirt.vmx.pvVirtApicPageR3)
+        {
+            SUPR3PageFreeEx(pVCpu->cpum.s.Guest.hwvirt.vmx.pvVirtApicPageR3, VMX_V_VIRT_APIC_PAGES);
+            pVCpu->cpum.s.Guest.hwvirt.vmx.pvVirtApicPageR3 = NULL;
+        }
     }
 }
@@ -948 +953 @@
             Assert(!pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR3);
             LogRel(("CPUM%u: Failed to alloc %u pages for the nested-guest's VMCS\n", pVCpu->idCpu, VMX_V_VMCS_PAGES));
+            break;
+        }
+
+        /*
+         * Allocate the Virtual-APIC page.
+         */
+        Assert(!pVCpu->cpum.s.Guest.hwvirt.vmx.pvVirtApicPageR3);
+        rc = SUPR3PageAllocEx(VMX_V_VIRT_APIC_PAGES, 0 /* fFlags */, &pVCpu->cpum.s.Guest.hwvirt.vmx.pvVirtApicPageR3,
+                              &pVCpu->cpum.s.Guest.hwvirt.vmx.pvVirtApicPageR0, NULL /* paPages */);
+        if (RT_FAILURE(rc))
+        {
+            Assert(!pVCpu->cpum.s.Guest.hwvirt.vmx.pvVirtApicPageR3);
+            LogRel(("CPUM%u: Failed to alloc %u pages for the nested-guest's Virtual-APIC page\n", pVCpu->idCpu,
+                    VMX_V_VIRT_APIC_PAGES));
             break;
         }