Changeset 74485 in vbox for trunk/src

Timestamp:

Sep 27, 2018 3:07:50 AM (6 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Nested VMX: bugref:9180 Fix LogRel calculating number of pages allocated for VMX strutures, assign enmHwvirt.

File:

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

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

@@ -844 +844 @@
     {
         PVMCPU pVCpu = &pVM->aCpus[i];
+        pVCpu->cpum.s.Guest.hwvirt.enmHwvirt = CPUMHWVIRT_SVM;
 
         /*
@@ -949 +950 @@
 {
     int rc = VINF_SUCCESS;
-    LogRel(("CPUM: Allocating %u pages for the nested-guest VMCS\n", pVM->cCpus * VMX_V_VMCS_SIZE));
+    LogRel(("CPUM: Allocating %u pages for the nested-guest VMCS and related structures\n",
+            pVM->cCpus * (  VMX_V_VMCS_PAGES + VMX_V_VIRT_APIC_PAGES + VMX_V_VMREAD_VMWRITE_BITMAP_PAGES * 2
+                          + VMX_V_AUTOMSR_AREA_PAGES));
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
     {
         PVMCPU pVCpu = &pVM->aCpus[i];
+        pVCpu->cpum.s.Guest.hwvirt.vmx.enmHwvirt = CPUMHWVIRT_VMX;
 
         /*