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

Timestamp:

Oct 6, 2021 9:02:05 AM (3 years ago)

Author:

vboxsync

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

147296

Message:

VMM/CPUM: When using NEM and a VM is configured with nested virtualization, don't rely on nested-paging and unrestricted guest execution being available since we disable nested virtualization anyway.

File:

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

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

@@ -4201 +4201 @@
         if (pConfig->fNestedHWVirt)
         {
-            if (!fNestedPagingAndFullGuestExec)
-                return VMSetError(pVM, VERR_CPUM_INVALID_HWVIRT_CONFIG, RT_SRC_POS,
-                                  "Cannot enable nested VT-x/AMD-V without nested-paging and unresricted guest execution!\n");
-
             /** @todo Think about enabling this later with NEM/KVM. */
             if (VM_IS_NEM_ENABLED(pVM))
@@ -4211 +4207 @@
                 pConfig->fNestedHWVirt = false;
             }
+            else if (!fNestedPagingAndFullGuestExec)
+                return VMSetError(pVM, VERR_CPUM_INVALID_HWVIRT_CONFIG, RT_SRC_POS,
+                                  "Cannot enable nested VT-x/AMD-V without nested-paging and unresricted guest execution!\n");
         }