Index: /trunk/include/VBox/apic.h =================================================================== --- /trunk/include/VBox/apic.h (revision 55253) +++ /trunk/include/VBox/apic.h (revision 55254) @@ -45,5 +45,5 @@ #define APIC_REG_EILVT1 0x0510 #define APIC_REG_EILVT2 0x0520 -#define APIC_REG_ELLVT3 0x0530 +#define APIC_REG_EILVT3 0x0530 #define APIC_REG_LVT_MODE_MASK (RT_BIT(8) | RT_BIT(9) | RT_BIT(10)) #define APIC_REG_LVT_MODE_FIXED 0 Index: /trunk/include/VBox/err.mac =================================================================== --- /trunk/include/VBox/err.mac (revision 55253) +++ /trunk/include/VBox/err.mac (revision 55254) @@ -124,4 +124,5 @@ %define VINF_PATCH_CONTINUE (1430) %define VERR_PATM_HM_IPE (-1431) +%define VERR_PATM_IPE_TRAP_IN_PATCH_CODE (-1432) %define VWRN_CSAM_TRAP_NOT_HANDLED 1500 %define VWRN_CSAM_INSTRUCTION_PATCHED 1501 @@ -225,4 +226,6 @@ %define VINF_CPUM_R3_MSR_READ (1758) %define VINF_CPUM_R3_MSR_WRITE (1759) +%define VERR_TOO_MANY_CPUID_LEAVES (1760) +%define VERR_CPUM_INVALID_CONFIG_VALUE (1761) %define VERR_SSM_UNIT_EXISTS (-1800) %define VERR_SSM_UNIT_NOT_FOUND (-1801) @@ -555,4 +558,5 @@ %define VERR_VD_UNKNOWN_INTERFACE (-3213) %define VERR_VD_DEK_MISSING (-3214) +%define VERR_VD_PASSWORD_INCORRECT (-3215) %define VERR_VD_GEN_INVALID_HEADER (-3220) %define VERR_VD_VDI_INVALID_HEADER (-3230) @@ -609,4 +613,10 @@ %define VERR_INTNET_INCOMPATIBLE_FLAGS (-3604) %define VERR_INTNET_FLT_VNIC_CREATE_FAILED (-3605) +%define VERR_INTNET_FLT_VNIC_LINK_ID_NOT_FOUND (-3606) +%define VERR_INTNET_FLT_VNIC_INIT_FAILED (-3607) +%define VERR_INTNET_FLT_VNIC_OPEN_FAILED (-3608) +%define VERR_INTNET_FLT_LOWER_LINK_INFO_NOT_FOUND (-3609) +%define VERR_INTNET_FLT_LOWER_LINK_OPEN_FAILED (-3610) +%define VERR_INTNET_FLT_LOWER_LINK_ID_NOT_FOUND (-3611) %define VERR_SUPDRV_COMPONENT_NOT_FOUND (-3700) %define VERR_SUPDRV_INTERFACE_NOT_SUPPORTED (-3701) @@ -655,4 +665,6 @@ %define VERR_SUPDRV_TSC_FREQ_MEASUREMENT_FAILED (-3744) %define VERR_SUPDRV_TSC_READ_FAILED (-3745) +%define VWRN_SUPDRV_TSC_DELTA_MEASUREMENT_FAILED 3746 +%define VERR_SUPDRV_TSC_DELTA_MEASUREMENT_BUSY (-3747) %define VERR_SUPLIB_PATH_NOT_ABSOLUTE (-3750) %define VERR_SUPLIB_PATH_NOT_CLEAN (-3751) @@ -963,5 +975,5 @@ %define VERR_GIM_HYPERCALLS_NOT_ENABLED (-6309) %define VERR_GIM_DEVICE_NOT_REGISTERED (-6310) -%define VERR_GIM_INVALID_GUESTOS_ID (-6311) +%define VERR_GIM_HYPERCALL_ACCESS_DENIED (-6311) %define VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR (-6400) %define VERR_MAIN_CONFIG_CONSTRUCTOR_IPE (-6401) Index: /trunk/include/iprt/err.mac =================================================================== --- /trunk/include/iprt/err.mac (revision 55253) +++ /trunk/include/iprt/err.mac (revision 55254) @@ -129,4 +129,6 @@ %define VWRN_UNABLE_TO_SATISFY_REQUIREMENTS 22406 %define VERR_ALLOCATION_TOO_BIG (-22407) +%define VERR_MISMATCH (-22408) +%define VERR_WRONG_TYPE (-22409) %define VERR_FILE_IO_ERROR (-100) %define VERR_OPEN_FAILED (-101) @@ -177,4 +179,5 @@ %define VERR_PATH_IS_NOT_RELATIVE (-144) %define VERR_PATH_ZERO_LENGTH (-145) +%define VERR_FILE_AIO_INSUFFICIENT_EVENTS (-146) %define VERR_DISK_IO_ERROR (-150) %define VERR_INVALID_DRIVE (-151) @@ -406,4 +409,6 @@ %define VERR_CPU_OFFLINE (-800) %define VERR_CPU_NOT_FOUND (-801) +%define VERR_NOT_ALL_CPUS_SHOWED (-802) +%define VERR_CPU_IPE_1 (-803) %define VERR_GETOPT_UNKNOWN_OPTION (-825) %define VERR_GETOPT_REQUIRED_ARGUMENT_MISSING (-826) Index: /trunk/include/iprt/x86.mac =================================================================== --- /trunk/include/iprt/x86.mac (revision 55253) +++ /trunk/include/iprt/x86.mac (revision 55254) @@ -68,4 +68,5 @@ %define X86_CPUID_FEATURE_ECX_SSSE3 RT_BIT(9) %define X86_CPUID_FEATURE_ECX_CNTXID RT_BIT(10) +%define X86_CPUID_FEATURE_ECX_SDBG RT_BIT(11) %define X86_CPUID_FEATURE_ECX_FMA RT_BIT(12) %define X86_CPUID_FEATURE_ECX_CX16 RT_BIT(13) @@ -142,4 +143,5 @@ %define X86_CPUID_STEXT_FEATURE_EBX_AVX512CD RT_BIT(28) %define X86_CPUID_STEXT_FEATURE_EBX_SHA RT_BIT(29) +%define X86_CPUID_STEXT_FEATURE_ECX_PREFETCHWT1 RT_BIT(0) %define X86_CPUID_EXT_FEATURE_ECX_LAHF_SAHF RT_BIT(0) %define X86_CPUID_EXT_FEATURE_EDX_SYSCALL RT_BIT(11) @@ -183,4 +185,9 @@ %define X86_CPUID_AMD_FEATURE_ECX_SKINIT RT_BIT(12) %define X86_CPUID_AMD_FEATURE_ECX_WDT RT_BIT(13) +%define X86_CPUID_AMD_FEATURE_ECX_LWP RT_BIT(15) +%define X86_CPUID_AMD_FEATURE_ECX_FMA4 RT_BIT(16) +%define X86_CPUID_AMD_FEATURE_ECX_NODEID RT_BIT(19) +%define X86_CPUID_AMD_FEATURE_ECX_TBM RT_BIT(21) +%define X86_CPUID_AMD_FEATURE_ECX_TOPOEXT RT_BIT(22) %define X86_CPUID_AMD_ADVPOWER_EDX_TS RT_BIT(0) %define X86_CPUID_AMD_ADVPOWER_EDX_FID RT_BIT(1) @@ -192,4 +199,8 @@ %define X86_CPUID_AMD_ADVPOWER_EDX_HWPSTATE RT_BIT(7) %define X86_CPUID_AMD_ADVPOWER_EDX_TSCINVAR RT_BIT(8) +%define X86_CPUID_AMD_ADVPOWER_EDX_CPB RT_BIT(9) +%define X86_CPUID_AMD_ADVPOWER_EDX_EFRO RT_BIT(10) +%define X86_CPUID_AMD_ADVPOWER_EDX_PFI RT_BIT(11) +%define X86_CPUID_AMD_ADVPOWER_EDX_PA RT_BIT(12) %define X86_CR0_PE RT_BIT(0) %define X86_CR0_PROTECTION_ENABLE RT_BIT(0) @@ -286,6 +297,8 @@ %define X86_DR7_GET_RW(uDR7, iBp) ( ( (uDR7) >> ((iBp) * 4 + 16) ) & 3 ) %define X86_DR7_RW_ALL_MASKS 0x33330000 -%define X86_DR7_ANY_RW_IO(uDR7) \ +%ifndef VBOX_FOR_DTRACE_LIB + %define X86_DR7_ANY_RW_IO(uDR7) \ ( ( 0x22220000 & (uDR7) ) +%endif %define X86_DR7_LEN_BYTE 0 %define X86_DR7_LEN_WORD 1 @@ -587,6 +600,18 @@ %define X86_PML4_SHIFT 39 %define X86_PML4_MASK 0x1ff +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif %define X86_OFF_FXSTATE_RSVD 0x1d0 %define X86_FXSTATE_RSVD_32BIT_MAGIC 0x32b3232b +%ifndef VBOX_FOR_DTRACE_LIB +%endif %define X86_FSW_IE RT_BIT(0) %define X86_FSW_DE RT_BIT(1) @@ -650,4 +675,31 @@ %ifndef VBOX_FOR_DTRACE_LIB %endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%define XSAVE_C_X87 RT_BIT_64(0) +%define XSAVE_C_SSE RT_BIT_64(1) +%define XSAVE_C_YMM RT_BIT_64(2) +%define XSAVE_C_BNDREGS RT_BIT_64(3) +%define XSAVE_C_BNDCSR RT_BIT_64(4) +%define XSAVE_C_OPMASK RT_BIT_64(5) +%define XSAVE_C_ZMM_HI256 RT_BIT_64(6) +%define XSAVE_C_ZMM_16HI RT_BIT_64(7) +%define XSAVE_C_LWP RT_BIT_64(62) +%ifndef VBOX_FOR_DTRACE_LIB +%endif %define X86DESCATTR_TYPE 0x0000000f %define X86DESCATTR_DT 0x00000010