Index: /trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac
===================================================================
--- /trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac	(revision 48238)
+++ /trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac	(revision 48239)
@@ -159,5 +159,5 @@
     pushf
     cli
-    DEBUG_CMOS_STACK32 10h
+    ;DEBUG_CMOS_STACK32 10h
 
     ;
@@ -431,4 +431,12 @@
     mov     eax, cr4
     mov     [edx + CPUMCPU.Host.cr4], eax
+%if 0 ; paranoia
+    test    eax, X86_CR4_VMXE
+    jz      .vmxe_fine
+    mov     eax, VERR_VMX_IN_VMX_ROOT_MODE
+    retf
+.vmxe_fine:
+%endif
+
     DEBUG32_S_CHAR('c')
     DEBUG32_S_CHAR(';')
@@ -478,4 +486,5 @@
 GLOBALNAME IDEnterTarget
     DEBUG32_CHAR('1')
+    DEBUG_CMOS_TRASH_AL 18h
 
     ; 1. Disable paging.
@@ -484,4 +493,5 @@
     mov     cr0, ebx
     DEBUG32_CHAR('2')
+    DEBUG_CMOS_TRASH_AL 19h
 
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
@@ -494,4 +504,5 @@
     or      ecx, X86_CR4_PAE
     mov     cr4, ecx
+    DEBUG_CMOS_TRASH_AL 1ah
 
     ; 3. Load long mode intermediate CR3.
@@ -500,4 +511,5 @@
     mov     cr3, ecx
     DEBUG32_CHAR('3')
+    DEBUG_CMOS_TRASH_AL 1bh
 
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
@@ -516,4 +528,5 @@
     mov     edx, esi
     DEBUG32_CHAR('4')
+    DEBUG_CMOS_TRASH_AL 1ch
 
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
@@ -539,4 +552,5 @@
 NAME(IDEnter64Mode):
     DEBUG64_CHAR('6')
+    DEBUG_CMOS_TRASH_AL 1dh
     jmp     [NAME(pICEnterTarget) wrt rip]
 
@@ -561,5 +575,5 @@
 ALIGNCODE(16)
 GLOBALNAME ICEnterTarget
-    DEBUG_CMOS_TRASH_AL 1ah
+    ;DEBUG_CMOS_TRASH_AL 1eh
     ; Load CPUM pointer into rdx
     mov     rdx, [NAME(pCpumIC) wrt rip]