Changeset 45875 in vbox for trunk/src/VBox/VMM

Timestamp:

May 2, 2013 12:52:33 PM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMR0: Distinguish better between invalid VMXON, VMCS pointers and VMCS pointers passed to VMLAUNCH/VMRESUME.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMR0A.asm (modified) (1 diff)
• VMMR0/HMR0Mixed.mac (modified) (6 diffs)
• VMMSwitcher/LegacyandAMD64.mac (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMR0A.asm

@@ -583 +583 @@
     xor     eax, eax
     vmxon   [rdx]
-    mov     r8d, VERR_INVALID_PARAMETER
+    mov     r8d, VERR_VMX_VMXON_FAILED
     cmovz   eax, r8d
-    mov     r9d, VERR_VMX_INVALID_VMCS_PTR
+    mov     r9d, VERR_VMX_INVALID_VMXON_PTR
     cmovc   eax, r9d
     jmp far [.fpret wrt rip]

trunk/src/VBox/VMM/VMMR0/HMR0Mixed.mac

@@ -171 +171 @@
 ALIGNCODE(16) ;; @todo YASM BUG - this alignment is wrong on darwin, it's 1 byte off.
 .vmlaunch_done:
-    jc      near .vmxstart_invalid_vmxon_ptr
+    jc      near .vmxstart_invalid_vmcs_ptr
     jz      near .vmxstart_start_failed
 
@@ -263 +263 @@
 
 
-.vmxstart_invalid_vmxon_ptr:
+.vmxstart_invalid_vmcs_ptr:
     ; Restore base and limit of the IDTR & GDTR
     lidt    [xSP]
@@ -297 +297 @@
     ; Restore all general purpose host registers.
     MYPOPAD
-    mov     eax, VERR_VMX_INVALID_VMXON_PTR
+    mov     eax, VERR_VMX_INVALID_VMCS_PTR_TO_START_VM
     jmp     .vmstart_end
 
@@ -502 +502 @@
 ALIGNCODE(16)
 .vmlaunch64_done:
-    jc      near .vmxstart64_invalid_vmxon_ptr
+    jc      near .vmxstart64_invalid_vmcs_ptr
     jz      near .vmxstart64_start_failed
 
@@ -611 +611 @@
 
 
-.vmxstart64_invalid_vmxon_ptr:
+.vmxstart64_invalid_vmcs_ptr:
     ; Restore base and limit of the IDTR & GDTR
     lidt    [xSP]
@@ -658 +658 @@
     ; Restore all general purpose host registers.
     MYPOPAD
-    mov     eax, VERR_VMX_INVALID_VMXON_PTR
+    mov     eax, VERR_VMX_INVALID_VMCS_PTR_TO_START_VM
     jmp     .vmstart64_end
 

trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac

@@ -774 +774 @@
 ALIGNCODE(16)
 .vmlaunch64_done:
-    jc      near .vmstart64_invalid_vmxon_ptr
+    jc      near .vmstart64_invalid_vmcs_ptr
     jz      near .vmstart64_start_failed
 
@@ -896 +896 @@
 
 
-.vmstart64_invalid_vmxon_ptr:
+.vmstart64_invalid_vmcs_ptr:
     pop     rsi         ; pCtx (needed in rsi by the macros below)
 
@@ -915 +915 @@
 
     ; Restore all general purpose host registers.
-    mov     eax, VERR_VMX_INVALID_VMXON_PTR
+    mov     eax, VERR_VMX_INVALID_VMCS_PTR_TO_START_VM
     jmp     .vmstart64_end