Index: /trunk/include/VBox/err.mac
===================================================================
--- /trunk/include/VBox/err.mac	(revision 59387)
+++ /trunk/include/VBox/err.mac	(revision 59388)
@@ -74,4 +74,5 @@
 %define VERR_EM_CANNOT_EXEC_GUEST    (-1156)
 %define VINF_EM_RAW_INJECT_TRPM_EVENT    1157
+%define VERR_EM_GUEST_CPU_HANG    (-1158)
 %define VERR_DBGF_NOT_ATTACHED    (-1200)
 %define VERR_DBGF_ALREADY_ATTACHED    (-1201)
@@ -436,4 +437,5 @@
 %define VERR_VMM_SWITCHER_STUB    (-2715)
 %define VERR_VMM_WRONG_HM_VMCPU_STATE    (-2716)
+%define VERR_VMM_SMAP_BUT_AC_CLEAR    (-2717)
 %define VERR_PDM_NO_SUCH_LUN    (-2800)
 %define VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES    (-2801)
@@ -530,4 +532,11 @@
 %define VERR_PDM_NOT_PCI_BUS_MASTER    (-2891)
 %define VERR_PDM_HM_IPE    (-2892)
+%define VERR_PDM_MEDIAEX_IOREQ_CANCELED    (-2893)
+%define VERR_PDM_MEDIAEX_IOBUF_OVERFLOW    (-2894)
+%define VERR_PDM_MEDIAEX_IOBUF_UNDERRUN    (-2895)
+%define VERR_PDM_MEDIAEX_IOREQID_CONFLICT    (-2896)
+%define VERR_PDM_MEDIAEX_IOREQID_NOT_FOUND    (-2897)
+%define VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS    2898
+%define VERR_PDM_MEDIAEX_IOREQ_INVALID_STATE    (-2899)
 %define VERR_HGCM_SERVICE_NOT_FOUND    (-2900)
 %define VINF_HGCM_CLIENT_REJECTED    2901
@@ -597,4 +606,8 @@
 %define VERR_VD_DMG_XML_PARSE_ERROR    (-3284)
 %define VERR_VD_DMG_NOT_FOUND_INSIDE_XAR    (-3285)
+%define VERR_VD_RAW_SIZE_MODULO_512    (-3286)
+%define VERR_VD_RAW_SIZE_MODULO_2048    (-3287)
+%define VERR_VD_RAW_SIZE_OPTICAL_TOO_SMALL    (-3288)
+%define VERR_VD_RAW_SIZE_FLOPPY_TOO_BIG    (-3289)
 %define VERR_VBGL_NOT_INITIALIZED    (-3300)
 %define VERR_VBGL_INVALID_ADDR    (-3301)
@@ -671,4 +684,6 @@
 %define VWRN_SUPDRV_TSC_DELTA_MEASUREMENT_FAILED    3746
 %define VERR_SUPDRV_TSC_DELTA_MEASUREMENT_BUSY    (-3747)
+%define VERR_SUPDRV_NOT_BUDDING_VM_PROCESS_1    (-3748)
+%define VERR_SUPDRV_NOT_BUDDING_VM_PROCESS_2    (-3749)
 %define VERR_SUPLIB_PATH_NOT_ABSOLUTE    (-3750)
 %define VERR_SUPLIB_PATH_NOT_CLEAN    (-3751)
@@ -759,6 +774,6 @@
 %define VERR_VMX_IPE_4    (-4026)
 %define VERR_VMX_IPE_5    (-4027)
-%define VERR_VMX_MSR_ALL_VMXON_DISABLED    (-4028)
-%define VERR_VMX_MSR_VMXON_DISABLED    (-4029)
+%define VERR_VMX_MSR_ALL_VMX_DISABLED    (-4028)
+%define VERR_VMX_MSR_VMX_DISABLED    (-4029)
 %define VERR_VMX_ENTRY_CTLS_CACHE_INVALID    (-4030)
 %define VERR_VMX_EXIT_CTLS_CACHE_INVALID    (-4031)
@@ -766,4 +781,6 @@
 %define VERR_VMX_PROC_EXEC_CTLS_CACHE_INVALID    (-4033)
 %define VERR_VMX_PROC_EXEC2_CTLS_CACHE_INVALID    (-4034)
+%define VERR_VMX_MSR_VMX_ENABLE_FAILED    (-4035)
+%define VERR_VMX_MSR_SMX_VMX_ENABLE_FAILED    (-4036)
 %define VERR_SVM_UNABLE_TO_START_VM    (-4050)
 %define VERR_SVM_ILLEGAL_EFER_MSR    (-4051)
@@ -991,6 +1008,12 @@
 %define VERR_GIM_DEVICE_NOT_REGISTERED    (-6310)
 %define VERR_GIM_HYPERCALL_ACCESS_DENIED    (-6311)
+%define VERR_GIM_HYPERCALL_MEMORY_READ_FAILED    (-6312)
+%define VERR_GIM_HYPERCALL_MEMORY_WRITE_FAILED    (-6313)
+%define VERR_GIM_HYPERCALL_FAILED    (-6314)
+%define VERR_GIM_NO_DEBUG_CONNECTION    (-6315)
+%define VINF_GIM_R3_HYPERCALL    6316
 %define VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR    (-6400)
 %define VERR_MAIN_CONFIG_CONSTRUCTOR_IPE    (-6401)
 %define VERR_GSTDND_GUEST_ERROR    (-6500)
+%define VERR_AUDIO_BACKEND_INIT_FAILED    (-6600)
 %include "iprt/err.mac"
Index: /trunk/include/iprt/err.mac
===================================================================
--- /trunk/include/iprt/err.mac	(revision 59387)
+++ /trunk/include/iprt/err.mac	(revision 59388)
@@ -131,4 +131,8 @@
 %define VERR_MISMATCH    (-22408)
 %define VERR_WRONG_TYPE    (-22409)
+%define VERR_PRIVILEGE_NOT_HELD    (-22410)
+%define VERR_PROC_TCB_PRIV_NOT_HELD    (-22411)
+%define VERR_PROC_APT_PRIV_NOT_HELD    (-22412)
+%define VERR_PROC_IQ_PRIV_NOT_HELD    (-22413)
 %define VERR_FILE_IO_ERROR    (-100)
 %define VERR_OPEN_FAILED    (-101)
@@ -437,4 +441,8 @@
 %define VERR_HTTP_ABORTED    (-893)
 %define VERR_HTTP_REDIRECTED    (-894)
+%define VERR_HTTP_PROXY_NOT_FOUND    (-895)
+%define VERR_HTTP_HOST_NOT_FOUND    (-896)
+%define VERR_HTTP_CURL_PROXY_CONFIG    (-897)
+%define VERR_HTTP_CURL_ERROR    (-899)
 %define VERR_MANIFEST_UNSUPPORTED_DIGEST_TYPE    (-900)
 %define VERR_MANIFEST_WRONG_FILE_FORMAT    (-901)
@@ -762,2 +770,17 @@
 %define VERR_CR_DIGEST_OSSL_DIGEST_INIT_ERROR    (-24200)
 %define VERR_CR_DIGEST_OSSL_DIGEST_CTX_COPY_ERROR    (-24201)
+%define VERR_PATH_MATCH_UNKNOWN_VARIABLE    (-24400)
+%define VERR_PATH_MATCH_VARIABLE_MUST_BE_FIRST    (-24401)
+%define VERR_PATH_MATCH_FEATURE_NOT_IMPLEMENTED    (-24402)
+%define VERR_PATH_GLOB_UNKNOWN_CHAR_CLASS    (-24403)
+%define VERR_URI_EMPTY    (-24600)
+%define VERR_URI_TOO_SHORT    (-24601)
+%define VERR_URI_INVALID_SCHEME    (-24602)
+%define VERR_URI_INVALID_PORT_NUMBER    (-24603)
+%define VERR_URI_INVALID_ESCAPE_SEQ    (-24604)
+%define VERR_URI_ESCAPED_ZERO    (-24605)
+%define VERR_URI_ESCAPED_CHARS_NOT_VALID_UTF8    (-24606)
+%define VERR_URI_INVALID_ESCAPED_UTF8_LEAD_BYTE    (-24607)
+%define VERR_URI_INVALID_ESCAPED_UTF8_CONTINUATION_BYTE    (-24608)
+%define VERR_URI_MISSING_UTF8_CONTINUATION_BYTE    (-24609)
+%define VERR_URI_NOT_FILE_SCHEME    (-24610)
Index: /trunk/include/iprt/x86.mac
===================================================================
--- /trunk/include/iprt/x86.mac	(revision 59387)
+++ /trunk/include/iprt/x86.mac	(revision 59388)
@@ -334,4 +334,5 @@
 %define MSR_IA32_BIOS_UPDT_TRIG             0x79
 %define MSR_IA32_BIOS_SIGN_ID               0x8B
+%define MSR_IA32_SMM_MONITOR_CTL            0x9B
 %define MSR_IA32_PMC0                       0xC1
 %define MSR_IA32_PMC1                       0xC2
@@ -525,6 +526,18 @@
 %define X86_PTE_LM_MBZ_MASK_NX              0x0000000000000000
 %define X86_PTE_LM_MBZ_MASK_NO_NX           0x8000000000000000
+%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_PT_SHIFT                        12
 %define X86_PT_MASK                         0x3ff
+%ifndef VBOX_FOR_DTRACE_LIB
+%endif
 %define X86_PT_PAE_SHIFT                    12
 %define X86_PT_PAE_MASK                     0x1ff
@@ -544,4 +557,8 @@
 %define X86_PDE_LM_MBZ_MASK_NX              0x0000000000000080
 %define X86_PDE_LM_MBZ_MASK_NO_NX           0x8000000000000080
+%ifndef VBOX_FOR_DTRACE_LIB
+%endif
+%ifndef VBOX_FOR_DTRACE_LIB
+%endif
 %define X86_PDE4M_P                         RT_BIT(0)
 %define X86_PDE4M_RW                        RT_BIT(1)
@@ -566,6 +583,18 @@
 %define X86_PDE2M_LM_MBZ_MASK_NX            0x00000000001fe000
 %define X86_PDE2M_LM_MBZ_MASK_NO_NX         0x80000000001fe000
+%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_PD_SHIFT                        22
 %define X86_PD_MASK                         0x3ff
+%ifndef VBOX_FOR_DTRACE_LIB
+%endif
 %define X86_PD_PAE_SHIFT                    21
 %define X86_PD_PAE_MASK                     0x1ff
@@ -585,4 +614,12 @@
 %define X86_PDPE1G_LM_MBZ_MASK_NX           0x000000003fffe000
 %define X86_PDPE1G_LM_MBZ_MASK_NO_NX        0x800000003fffe000
+%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_PDPT_SHIFT             30
 %define X86_PDPT_MASK_PAE          0x3
@@ -599,4 +636,10 @@
 %define X86_PML4E_MBZ_MASK_NO_NX            0x8000000000000080
 %define X86_PML4E_NX                        RT_BIT_64(63)
+%ifndef VBOX_FOR_DTRACE_LIB
+%endif
+%ifndef VBOX_FOR_DTRACE_LIB
+%endif
+%ifndef VBOX_FOR_DTRACE_LIB
+%endif
 %define X86_PML4_SHIFT              39
 %define X86_PML4_MASK               0x1ff
@@ -821,4 +864,6 @@
 %ifndef VBOX_FOR_DTRACE_LIB
 %endif
+%ifndef VBOX_FOR_DTRACE_LIB
+%endif
 %define X86_SEL_SHIFT           3
 %define X86_SEL_MASK            0xfff8
