Index: /trunk/include/iprt/x86.mac
===================================================================
--- /trunk/include/iprt/x86.mac	(revision 66603)
+++ /trunk/include/iprt/x86.mac	(revision 66604)
@@ -209,4 +209,15 @@
 %define X86_CPUID_AMD_ADVPOWER_EDX_PFI       RT_BIT_32(11)
 %define X86_CPUID_AMD_ADVPOWER_EDX_PA        RT_BIT_32(12)
+%define X86_CPUID_SVM_FEATURE_EDX_NESTED_PAGING             RT_BIT(0)
+%define X86_CPUID_SVM_FEATURE_EDX_LBR_VIRT                  RT_BIT(1)
+%define X86_CPUID_SVM_FEATURE_EDX_SVM_LOCK                  RT_BIT(2)
+%define X86_CPUID_SVM_FEATURE_EDX_NRIP_SAVE                 RT_BIT(3)
+%define X86_CPUID_SVM_FEATURE_EDX_TSC_RATE_MSR              RT_BIT(4)
+%define X86_CPUID_SVM_FEATURE_EDX_VMCB_CLEAN                RT_BIT(5)
+%define X86_CPUID_SVM_FEATURE_EDX_FLUSH_BY_ASID             RT_BIT(6)
+%define X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSIST             RT_BIT(7)
+%define X86_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER              RT_BIT(10)
+%define X86_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER_THRESHOLD    RT_BIT(12)
+%define X86_CPUID_SVM_FEATURE_EDX_AVIC                      RT_BIT(13)
 %define X86_CR0_PE                          RT_BIT_32(0)
 %define X86_CR0_PROTECTION_ENABLE           RT_BIT_32(0)
Index: /trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp	(revision 66603)
+++ /trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp	(revision 66604)
@@ -521,5 +521,5 @@
                 {
                     if (   uVector == X86_XCPT_NMI
-                        || uVector > 31 /* X86_XCPT_MAX */)
+                        || uVector > X86_XCPT_LAST)
                     {
                         Log(("HMSvmVmRun: Invalid vector for hardware exception. uVector=%#x -> #VMEXIT\n", uVector));
@@ -783,7 +783,5 @@
  * @retval  VERR_APIC_INTR_MASKED_BY_TPR when an APIC interrupt is pending but
  *          can't be delivered due to TPR priority.
- * @retval  VERR_NO_DATA if there is no interrupt to be delivered (either APIC
- *          has been software-disabled since it flagged something was pending,
- *          or other reasons).
+ * @retval  VERR_NO_DATA if there is no interrupt to be delivered.
  *
  * @param   pCtx            The guest-CPU context.
Index: /trunk/src/VBox/VMM/VMMAll/IEMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/IEMAll.cpp	(revision 66603)
+++ /trunk/src/VBox/VMM/VMMAll/IEMAll.cpp	(revision 66604)
@@ -5274,5 +5274,5 @@
             && (fFlags & IEM_XCPT_FLAGS_T_CPU_XCPT))
         {
-            Assert(u8Vector <= 31 /* X86_XCPT_MAX */);
+            Assert(u8Vector <= X86_XCPT_LAST);
             uint64_t const uExitInfo1 = fFlags & IEM_XCPT_FLAGS_ERR ? uErr : 0;
             uint64_t const uExitInfo2 = fFlags & IEM_XCPT_FLAGS_CR2 ? uCr2 : 0;