Changeset 15031 in vbox

Timestamp:

Dec 5, 2008 12:08:28 PM (16 years ago)

Author:

vboxsync

Message:

Switcher updates

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (1 diff)
• VMMGC/HWACCMGCA.asm (modified) (3 diffs)
• VMMR0/HWSVMR0.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -35 +35 @@
 #include <iprt/mp.h>
 
-#if HC_ARCH_BITS == 64 || defined (VBOX_WITH_64_BITS_GUESTS)
+#if HC_ARCH_BITS == 64 // || defined (VBOX_WITH_64_BITS_GUESTS)
 /* Enable 64 bits guest support. */
 # define VBOX_ENABLE_64_BITS_GUESTS

trunk/src/VBox/VMM/VMMGC/HWACCMGCA.asm

@@ -107 +107 @@
 ; *
 ; * @returns VBox status code
-; * @param   pCtx       Guest context (rsi)
+; * @param   pPageCpuPhys   VMXON physical address  [rsp+8]
+; * @param   pVMCSPhys      VMCS physical address   [rsp+16]
+; * @param   pCtx           Guest context (rsi)
 ; */
 BEGINPROC VMXGCStartVM64
@@ -113 +115 @@
     mov     rbp, rsp
 
+    ; Make sure VT-x instructions are allowed
+    mov     rax, cr4
+    or      rax, X86_CR4_VMXE
+    mov     cr4, rax
+
+    ;/* Enter VMX Root Mode */
+    vmxon   [rbp + 8 + 8]
+    jnc     .vmxon_success
+    mov     rax, VERR_VMX_INVALID_VMXON_PTR
+    jmp     .vmstart64_vmxon_failed
+    
+.vmxon_success:
+    ; Activate the VMCS pointer
+    vmptrld [rbp + 16 + 8]
+    jnc     .vmptrld_success
+    mov     rax, VERR_VMX_INVALID_VMCS_PTR
+    jmp     .vmstart64_vmoff_end
+    
+.vmptrld_success:    
     ; Have to sync half the guest state as we can't access most of the 64 bits state in 32 bits mode. Sigh.
     VMCSWRITE VMX_VMCS64_GUEST_CS_BASE,         [rsi + CPUMCTX.csHid.u64Base]
@@ -253 +274 @@
 
 .vmstart64_end:
+    ; Write back the data and disable the VMCS
+    vmclear [rbp + 16 + 8]  ;pVMCS
+
+.vmstart64_vmoff_end:
+    ; Disable VMX root mode
+    vmxoff
+.vmstart64_vmxon_failed:
     pop     rbp
     ret

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -758 +758 @@
     if (pCtx->msrEFER & MSR_K6_EFER_LMA)
     {
-#if !defined(VBOX_WITH_64_BITS_GUESTS)
+#if !defined(VBOX_ENABLE_64_BITS_GUESTS)
         return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
 #elif HC_ARCH_BITS == 32

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -1502 +1502 @@
     if (pCtx->msrEFER & MSR_K6_EFER_LMA)
     {
-#if !defined(VBOX_WITH_64_BITS_GUESTS)
+#if !defined(VBOX_ENABLE_64_BITS_GUESTS)
         return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
 #elif HC_ARCH_BITS == 32