Changeset 79085 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 11, 2019 10:47:36 AM (6 years ago)

Author:

vboxsync

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

131245

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Don't need to pre-initialize the nested-guest MSR bitmap as we initialize it while merging MSR bitmaps.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -1402 +1402 @@
              * The guest visible nested-guest MSR bitmap needs to remain unchanged.
              * Hence, allocate a separate MSR bitmap for the guest and nested-guest.
+             * We also don't need to re-initialize the nested-guest MSR bitmap here as
+             * we do that later while merging VMCS.
              */
             if (pVM->hm.s.vmx.Msrs.ProcCtls.n.allowed1 & VMX_PROC_CTLS_USE_MSR_BITMAPS)
             {
                 rc = hmR0VmxPageAllocZ(&pVmcsInfo->hMemObjMsrBitmap, &pVmcsInfo->pvMsrBitmap, &pVmcsInfo->HCPhysMsrBitmap);
-                if (RT_SUCCESS(rc))
+                if (   RT_SUCCESS(rc)
+                    && fIsNstGstVmcs)
                     ASMMemFill32(pVmcsInfo->pvMsrBitmap, X86_PAGE_4K_SIZE, UINT32_C(0xffffffff));
             }