VBox

Timestamp:

Apr 10, 2013 8:25:33 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84919

Message:

VMM: Remove unused error codes, use more specific error codes. Restore CR4 on VMXON failures in the new VT-x code.

Location:

trunk/include/VBox

Files:

trunk/include/VBox/err.h

-              r45434
+              r45474
 /** Invalid VMXON pointer. */
 #define VERR_VMX_INVALID_VMXON_PTR                  (-4002)
-/** Generic VMX failure. */
-#define VERR_VMX_GENERIC                            (-4003)
 /** Invalid CPU mode for VMX execution. */
 #define VERR_VMX_UNSUPPORTED_MODE                   (-4004)
 /** Unable to start VM execution. */
 #define VERR_VMX_UNABLE_TO_START_VM                 (-4005)
-/** Unable to resume VM execution. */
-#define VERR_VMX_UNABLE_TO_RESUME_VM                (-4006)
 /** Unable to switch due to invalid host state. */
 #define VERR_VMX_INVALID_HOST_STATE                 (-4007)
 …
 /** Resume guest execution after injecting a double-fault. */
 #define VINF_VMX_DOUBLE_FAULT                       4020
+/** VMPTRLD failed; possibly because of invalid VMCS launch-state. */
+#define VERR_VMX_VMPTRLD_FAILED                     (-4021)
 /** @} */

-              r43387
+              r45474
 %define VERR_VMX_INVALID_VMCS_PTR    (-4001)
 %define VERR_VMX_INVALID_VMXON_PTR    (-4002)
-%define VERR_VMX_GENERIC    (-4003)
 %define VERR_VMX_UNSUPPORTED_MODE    (-4004)
 %define VERR_VMX_UNABLE_TO_START_VM    (-4005)
 …
 %define VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_CODE    (-4017)
 %define VERR_VMX_NOT_IN_VMX_ROOT_MODE    (-4018)
+%define VERR_VMX_UNDEFINED_EXIT_CODE     (-4019)
+%define VINF_VMX_DOUBLE_FAULT              4020
+%define VERR_VMX_VMPTRLD_FAILED          (-4021)
 %define VERR_SVM_UNABLE_TO_START_VM    (-4050)
 %define VERR_SVM_ILLEGAL_EFER_MSR    (-4051)

-              r45411
+              r45474
        "jmp      2f                                             \n\t"
        "1:                                                      \n\t"
        "movl     $"STR(VERR_VMX_GENERIC)", %0                   \n\t"
+       "movl     $"STR(VERR_VMX_VMXON_FAILED)", %0              \n\t"
        "2:                                                      \n\t"
        "add      $8, %%esp                                      \n\t"
 …
 vmxon_good:
         jnz     the_end
         mov     dword ptr [rc], VERR_VMX_GENERIC
+        mov     dword ptr [rc], VERR_VMX_VMXON_FAILED
 the_end:
         add     esp, 8

Note: See TracChangeset for help on using the changeset viewer.