Changeset 49668 in vbox

Timestamp:

Nov 26, 2013 4:29:44 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Added a couple of missing Unsupported-Feature Combos errors.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -126 +126 @@
 /** Invalid VMCS size. */
 #define VMX_UFC_INVALID_VMCS_SIZE                               7
+/** Unsupported secondary processor-based VM-execution controls combo. */
+#define VMX_UFC_CTRL_PROC_EXEC2                                 8
+/** Invalid unrestricted-guest execution controls combo. */
+#define VMX_UFC_INVALID_UX_COMBO                                9
 /** @} */
 

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

@@ -2419 +2419 @@
             LogRel(("hmR0VmxSetupProcCtls: invalid secondary processor-based VM-execution controls combo! "
                     "cpu=%#RX64 val=%#RX64 zap=%#RX64\n", pVM->hm.s.vmx.Msrs.VmxProcCtls2.n.disallowed0, val, zap));
+            pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_PROC_EXEC2;
             return VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO;
         }
@@ -2432 +2433 @@
         LogRel(("hmR0VmxSetupProcCtls: Unrestricted Guest set as true when secondary processor-based VM-execution controls not "
                 "available\n"));
+        pVCpu->hm.s.u32HMError = VMX_UFC_INVALID_UX_COMBO;
         return VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO;
     }