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

Timestamp:

Aug 17, 2018 4:54:52 PM (7 years ago)

Author:

vboxsync

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

124422

Message:

VMM/CPUM: Nested VMX: bugref:9180 build fix.

File:

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

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

@@ -1438 +1438 @@
      * Allocate memory required by the guest hardware virtualization state.
      */
-    if (pVM->cpum.ro.GuestFeatures.fSvm)
-    {
+    if (pVM->cpum.ro.GuestFeatures.fVmx)
+        rc = cpumR3AllocVmxHwVirtState(pVM);
+    else if (pVM->cpum.ro.GuestFeatures.fSvm)
         rc = cpumR3AllocSvmHwVirtState(pVM);
-        if (RT_FAILURE(rc))
-            return rc;
-    }
+    if (RT_FAILURE(rc))
+        return rc;
 
     /*
@@ -1521 +1521 @@
 
     if (pVM->cpum.ro.GuestFeatures.fSvm)
+        cpumR3FreeVmxHwVirtState(pVM);
+    else if (pVM->cpum.ro.GuestFeatures.fSvm)
         cpumR3FreeSvmHwVirtState(pVM);
     return VINF_SUCCESS;