Changeset 18842 in vbox for trunk/include/VBox

Timestamp:

Apr 7, 2009 11:31:08 PM (16 years ago)

Author:

vboxsync

Message:

iprt/err.mac,VBox/err.mac,VBox/x86.mac: regenerated.

Location:

trunk/include/VBox

Files:

• err.mac (modified) (6 diffs)
• x86.mac (modified) (3 diffs)

trunk/include/VBox/err.mac

@@ -55 +55 @@
 %define VINF_EM_RAW_STALE_SELECTOR    1138
 %define VINF_EM_RAW_IRET_TRAP    1139
+%define VINF_EM_RAW_EMULATE_IO_BLOCK    1140
 %define VERR_EM_INTERPRETER    (-1148)
 %define VERR_EM_INTERNAL_ERROR    (-1149)
@@ -129 +130 @@
 %define VERR_PGM_INTERMEDIATE_PAGING_CONFLICT    (-1627)
 %define VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE    (-1628)
+%define VERR_PGM_DYNMAP_FAILED    (-1629)
+%define VERR_PGM_DYNMAP_FULL_SET    (-1630)
+%define VERR_PGM_DYNMAP_SETUP_ERROR    (-1631)
+%define VERR_PGM_DYNMAP_EXPAND_ERROR    (-1632)
+%define VERR_PGM_PHYS_TLB_UNASSIGNED    (-1633)
+%define VERR_PGM_PHYS_TLB_CATCH_ALL    (-1634)
+%define VINF_PGM_PHYS_TLB_CATCH_WRITE    1635
+%define VERR_PGM_NO_CR3_SHADOW_ROOT    (-1636)
+%define VERR_PGM_PHYS_INVALID_PAGE_ID    (-1637)
+%define VERR_PGM_PHYS_WR_HIT_HANDLER    (-1638)
+%define VERR_PGM_PHYS_NOT_RAM    (-1639)
+%define VERR_PGM_PHYS_NOT_ROM    (-1640)
+%define VERR_PGM_PHYS_NOT_MMIO    (-1641)
+%define VERR_PGM_PHYS_NOT_MMIO2    (-1642)
+%define VERR_PGM_HANDLER_ALREADY_ALIASED    (-1643)
+%define VINF_PGM_HANDLER_ALREADY_ALIASED    (1643)
 %define VERR_MM_RAM_CONFLICT    (-1700)
 %define VERR_MM_HYPER_NO_MEMORY    (-1701)
@@ -142 +159 @@
 %define VERR_SSM_INTEGRITY_UNIT_MAGIC    (-1816)
 %define VERR_SSM_INTEGRITY_UNIT_NOT_FOUND    (-1817)
-%define VERR_SSM_NO_LOAD_EXEC    (-1818)
-%define VERR_SSM_LOADED_TOO_MUCH    (-1819)
-%define VERR_SSM_INVALID_STATE    (-1820)
-%define VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION    (-1821)
-%define VERR_SSM_DATA_UNIT_FORMAT_CHANGED    (-1822)
-%define VERR_SSM_LOAD_CPUID_MISMATCH    (-1823)
-%define VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH    (-1824)
-%define VERR_SSM_LOAD_CONFIG_MISMATCH    (-1825)
-%define VERR_SSM_VIRTUAL_CLOCK_HZ    (-1826)
-%define VERR_SSM_IDE_ASYNC_TIMEOUT    (-1827)
-%define VERR_SSM_STRUCTURE_MAGIC    (-1828)
-%define VERR_SSM_UNEXPECTED_DATA    (-1829)
+%define VERR_SSM_INTEGRITY_SIZES    (-1818)
+%define VERR_SSM_INTEGRITY_VBOX_VERSION    (-1819)
+%define VERR_SSM_NO_LOAD_EXEC    (-1820)
+%define VERR_SSM_LOADED_TOO_MUCH    (-1821)
+%define VERR_SSM_INVALID_STATE    (-1822)
+%define VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION    (-1823)
+%define VERR_SSM_DATA_UNIT_FORMAT_CHANGED    (-1824)
+%define VERR_SSM_LOAD_CPUID_MISMATCH    (-1825)
+%define VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH    (-1826)
+%define VERR_SSM_LOAD_CONFIG_MISMATCH    (-1827)
+%define VERR_SSM_VIRTUAL_CLOCK_HZ    (-1828)
+%define VERR_SSM_IDE_ASYNC_TIMEOUT    (-1829)
+%define VERR_SSM_STRUCTURE_MAGIC    (-1830)
+%define VERR_SSM_UNEXPECTED_DATA    (-1831)
+%define VERR_SSM_GCPHYS_OVERFLOW    (-1832)
+%define VERR_SSM_GCPTR_OVERFLOW    (-1833)
 %define VERR_VM_ATRESET_NOT_FOUND    (-1900)
 %define VERR_VM_REQUEST_INVALID_TYPE    (-1901)
@@ -328 +349 @@
 %define VERR_HOSTIF_FD_AND_INIT_TERM    (-3104)
 %define VERR_HOSTIF_TERM_FAILED    (-3105)
-%define VERR_VDI_INVALID_HEADER    (-3200)
-%define VERR_VDI_INVALID_SIGNATURE    (-3201)
-%define VERR_VDI_UNSUPPORTED_VERSION    (-3202)
-%define VERR_VDI_INVALID_TYPE    (-3203)
-%define VERR_VDI_INVALID_FLAGS    (-3204)
-%define VERR_VDI_INVALID_STATE    (-3205)
-%define VERR_VDI_WRONG_DIFF_IMAGE    (-3206)
-%define VERR_VDI_IMAGES_VERSION_MISMATCH    (-3207)
-%define VERR_VDI_IMAGES_UUID_MISMATCH    (-3208)
-%define VERR_VDI_NO_DIFF_IMAGES    (-3209)
-%define VERR_VDI_NOT_OPENED    (-3210)
-%define VERR_VDI_IMAGE_NOT_FOUND    (-3211)
-%define VERR_VDI_IMAGE_READ_ONLY    (-3212)
-%define VERR_VDI_COMMENT_TOO_LONG    (-3213)
-%define VERR_VDI_GEOMETRY_NOT_SET    (-3214)
-%define VERR_VDI_BLOCK_FREE    (-3215)
-%define VERR_VDI_VALUE_NOT_FOUND    (-3216)
-%define VERR_VDI_UNKNOWN_CFG_VALUES    (-3217)
-%define VINF_VDI_ASYNC_IO_FINISHED    3218
-%define VERR_VDI_ASYNC_IO_IN_PROGRESS    (-3219)
+%define VERR_VD_INVALID_TYPE    (-3200)
+%define VERR_VD_INVALID_STATE    (-3201)
+%define VERR_VD_VALUE_NOT_FOUND    (-3202)
+%define VERR_VD_NOT_OPENED    (-3203)
+%define VERR_VD_IMAGE_NOT_FOUND    (-3204)
+%define VERR_VD_IMAGE_READ_ONLY    (-3205)
+%define VERR_VD_GEOMETRY_NOT_SET    (-3206)
+%define VERR_VD_BLOCK_FREE    (-3207)
+%define VERR_VD_UUID_MISMATCH    (-3208)
+%define VINF_VD_ASYNC_IO_FINISHED    3209
+%define VERR_VD_ASYNC_IO_IN_PROGRESS    (-3210)
+%define VERR_VD_INVALID_SIZE    (-3211)
+%define VERR_VD_GEN_INVALID_HEADER    (-3220)
+%define VERR_VD_VDI_INVALID_HEADER    (-3230)
+%define VERR_VD_VDI_INVALID_SIGNATURE    (-3231)
+%define VERR_VD_VDI_UNSUPPORTED_VERSION    (-3232)
+%define VERR_VD_VDI_COMMENT_TOO_LONG    (-3233)
+%define VERR_VD_VMDK_INVALID_HEADER    (-3240)
+%define VERR_VD_VMDK_UNSUPPORTED_VERSION    (-3241)
+%define VERR_VD_VMDK_VALUE_NOT_FOUND    (-3242)
+%define VERR_VD_VMDK_INVALID_STATE    (-3243)
+%define VERR_VD_VMDK_INVALID_FORMAT    (-3244)
+%define VERR_VD_VMDK_INVALID_WRITE    (-3245)
+%define VERR_VD_ISCSI_INVALID_HEADER    (-3250)
+%define VERR_VD_ISCSI_UNKNOWN_CFG_VALUES    (-3251)
+%define VERR_VD_ISCSI_UNKNOWN_INTERFACE    (-3252)
+%define VERR_VD_ISCSI_INVALID_STATE    (-3253)
+%define VERR_VD_ISCSI_INVALID_TYPE    (-3254)
+%define VERR_VD_VHD_INVALID_HEADER    (-3260)
+%define VERR_VD_RAW_INVALID_HEADER    (-3270)
+%define VERR_VD_RAW_INVALID_TYPE    (-3271)
 %define VERR_VBGL_NOT_INITIALIZED    (-3300)
 %define VERR_VBGL_INVALID_ADDR    (-3301)
@@ -367 +399 @@
 %define VERR_SUPDRV_COMPONENT_NOT_FOUND    (-3700)
 %define VERR_SUPDRV_INTERFACE_NOT_SUPPORTED    (-3701)
+%define VERR_SUPDRV_SERVICE_NOT_FOUND    (-3702)
 %define VERR_GMM_SEED_ME    (-3800)
 %define VERR_GMM_OUT_OF_MEMORY    (-3801)
@@ -403 +436 @@
 %define VERR_VMX_UNEXPECTED_EXCEPTION    (-4016)
 %define VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_CODE    (-4017)
+%define VINF_VMX_PREEMPT_PENDING    (4018)
 %define VERR_SVM_UNABLE_TO_START_VM    (-4050)
 %define VERR_SVM_ILLEGAL_EFER_MSR    (-4051)
 %define VERR_SVM_NO_SVM    (-4052)
 %define VERR_SVM_DISABLED    (-4053)
+%define VINF_SVM_PREEMPT_PENDING    VINF_VMX_PREEMPT_PENDING
 %define VERR_HWACCM_UNKNOWN_CPU    (-4100)
 %define VERR_HWACCM_NO_CPUID    (-4101)
 %define VERR_HWACCM_SUSPEND_PENDING    (-4102)
+%define VERR_HWACCM_CONFIG_MISMATCH    (-4103)
 %define VERR_DIS_INVALID_OPCODE    (-4200)
 %define VERR_DIS_GEN_FAILURE    (-4201)

trunk/include/VBox/x86.mac

@@ -19 +19 @@
 %define X86_EFL_IOPL_SHIFT  12
 %define X86_EFL_GET_IOPL(efl)   (((efl) >> X86_EFL_IOPL_SHIFT) & 3)
+%define X86_EFL_POPF_BITS       (X86_EFL_CF | X86_EFL_PF | X86_EFL_AF | X86_EFL_ZF | X86_EFL_SF | X86_EFL_TF | X86_EFL_IF | X86_EFL_DF | X86_EFL_OF | X86_EFL_IOPL | X86_EFL_NT | X86_EFL_AC | X86_EFL_ID)
 %define X86_CPUID_VENDOR_INTEL_EBX      0x756e6547      /* Genu */
 %define X86_CPUID_VENDOR_INTEL_ECX      0x6c65746e      /* ntel */
@@ -213 +214 @@
 %define MSR_IA32_MCP_CTRL                   0x17B
 %define MSR_IA32_CR_PAT                     0x277
+%define MSR_IA32_PERFEVTSEL0                0x186
+%define MSR_IA32_PERFEVTSEL1                0x187
+%define MSR_IA32_PERF_STATUS                0x198
+%define MSR_IA32_PERF_CTL                   0x199
 %define MSR_IA32_MTRR_DEF_TYPE              0x2FF
 %define MSR_IA32_MC0_CTL                    0x400
@@ -296 +301 @@
 %define X86_PAGE_4M_BASE_MASK               0xffffffffffc00000ULL
 %define X86_PAGE_4M_BASE_MASK_32            0xffc00000
+%define X86_PTE_BIT_P                       0
+%define X86_PTE_BIT_RW                      1
+%define X86_PTE_BIT_US                      2
+%define X86_PTE_BIT_PWT                     3
+%define X86_PTE_BIT_PCD                     4
+%define X86_PTE_BIT_A                       5
+%define X86_PTE_BIT_D                       6
+%define X86_PTE_BIT_PAT                     7
+%define X86_PTE_BIT_G                       8
 %define X86_PTE_P                           RT_BIT(0)
 %define X86_PTE_RW                          RT_BIT(1)