Index: /trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac
===================================================================
--- /trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac	(revision 78226)
+++ /trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac	(revision 78227)
@@ -863,17 +863,17 @@
 
  %ifdef VBOX_WITH_CRASHDUMP_MAGIC
-    mov     qword [rbx + VMXVMCSBATCHCACHE.uPos], 2
+    mov     qword [rbx + VMXVMCSCACHE.uPos], 2
  %endif
 
  %ifdef DEBUG
     mov     rax, [rbp + 8 + 8]                              ; HCPhysCpuPage
-    mov     [rbx + VMXVMCSBATCHCACHE.TestIn.HCPhysCpuPage], rax
+    mov     [rbx + VMXVMCSCACHE.TestIn.HCPhysCpuPage], rax
     mov     rax, [rbp + 16 + 8]                             ; HCPhysVmcs
-    mov     [rbx + VMXVMCSBATCHCACHE.TestIn.HCPhysVmcs], rax
-    mov     [rbx + VMXVMCSBATCHCACHE.TestIn.pCache], rbx
-    mov     [rbx + VMXVMCSBATCHCACHE.TestIn.pCtx], rsi
+    mov     [rbx + VMXVMCSCACHE.TestIn.HCPhysVmcs], rax
+    mov     [rbx + VMXVMCSCACHE.TestIn.pCache], rbx
+    mov     [rbx + VMXVMCSCACHE.TestIn.pCtx], rsi
  %endif
 
-    mov     ecx, [rbx + VMXVMCSBATCHCACHE.Write.cValidEntries]
+    mov     ecx, [rbx + VMXVMCSCACHE.Write.cValidEntries]
     cmp     ecx, 0
     je      .no_cached_writes
@@ -884,15 +884,15 @@
 ALIGN(16)
 .cached_write:
-    mov     eax, [rbx + VMXVMCSBATCHCACHE.Write.aField + rcx*4]
-    vmwrite rax, qword [rbx + VMXVMCSBATCHCACHE.Write.aFieldVal + rcx*8]
+    mov     eax, [rbx + VMXVMCSCACHE.Write.aField + rcx*4]
+    vmwrite rax, qword [rbx + VMXVMCSCACHE.Write.aFieldVal + rcx*8]
     inc     rcx
     cmp     rcx, rdx
     jl     .cached_write
 
-    mov     dword [rbx + VMXVMCSBATCHCACHE.Write.cValidEntries], 0
+    mov     dword [rbx + VMXVMCSCACHE.Write.cValidEntries], 0
 .no_cached_writes:
 
  %ifdef VBOX_WITH_CRASHDUMP_MAGIC
-    mov     qword [rbx + VMXVMCSBATCHCACHE.uPos], 3
+    mov     qword [rbx + VMXVMCSCACHE.uPos], 3
  %endif
     ; Save the pCache pointer.
@@ -946,5 +946,5 @@
 
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
-    mov     qword [rbx + VMXVMCSBATCHCACHE.uPos], 4
+    mov     qword [rbx + VMXVMCSCACHE.uPos], 4
 %endif
 
@@ -969,5 +969,5 @@
 
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
-    mov     qword [rbx + VMXVMCSBATCHCACHE.uPos], 5
+    mov     qword [rbx + VMXVMCSCACHE.uPos], 5
 %endif
 
@@ -1084,14 +1084,14 @@
 
  %ifdef VBOX_WITH_CRASHDUMP_MAGIC
-    mov     dword [rdi + VMXVMCSBATCHCACHE.uPos], 7
+    mov     dword [rdi + VMXVMCSCACHE.uPos], 7
  %endif
  %ifdef DEBUG
-    mov     [rdi + VMXVMCSBATCHCACHE.TestOut.pCache], rdi
-    mov     [rdi + VMXVMCSBATCHCACHE.TestOut.pCtx], rsi
+    mov     [rdi + VMXVMCSCACHE.TestOut.pCache], rdi
+    mov     [rdi + VMXVMCSCACHE.TestOut.pCtx], rsi
     mov     rax, cr8
-    mov     [rdi + VMXVMCSBATCHCACHE.TestOut.cr8], rax
+    mov     [rdi + VMXVMCSCACHE.TestOut.cr8], rax
  %endif
 
-    mov     ecx, [rdi + VMXVMCSBATCHCACHE.Read.cValidEntries]
+    mov     ecx, [rdi + VMXVMCSCACHE.Read.cValidEntries]
     cmp     ecx, 0  ; Can't happen
     je      .no_cached_reads
@@ -1101,11 +1101,11 @@
 .cached_read:
     dec     rcx
-    mov     eax, [rdi + VMXVMCSBATCHCACHE.Read.aField + rcx*4]
-    vmread  qword [rdi + VMXVMCSBATCHCACHE.Read.aFieldVal + rcx*8], rax
+    mov     eax, [rdi + VMXVMCSCACHE.Read.aField + rcx*4]
+    vmread  qword [rdi + VMXVMCSCACHE.Read.aFieldVal + rcx*8], rax
     cmp     rcx, 0
     jnz     .cached_read
 .no_cached_reads:
  %ifdef VBOX_WITH_CRASHDUMP_MAGIC
-    mov     dword [rdi + VMXVMCSBATCHCACHE.uPos], 8
+    mov     dword [rdi + VMXVMCSCACHE.uPos], 8
  %endif
 %endif
@@ -1117,5 +1117,5 @@
 
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
-    mov     dword [rdi + VMXVMCSBATCHCACHE.uPos], 9
+    mov     dword [rdi + VMXVMCSCACHE.uPos], 9
 %endif
 .vmstart64_end:
@@ -1124,5 +1124,5 @@
  %ifdef DEBUG
     mov     rdx, [rsp]                             ; HCPhysVmcs
-    mov     [rdi + VMXVMCSBATCHCACHE.TestOut.HCPhysVmcs], rdx
+    mov     [rdi + VMXVMCSCACHE.TestOut.HCPhysVmcs], rdx
  %endif
 %endif
@@ -1143,7 +1143,7 @@
     pushf
     pop     rdx
-    mov     [rdi + VMXVMCSBATCHCACHE.TestOut.eflags], rdx
+    mov     [rdi + VMXVMCSCACHE.TestOut.eflags], rdx
   %ifdef VBOX_WITH_CRASHDUMP_MAGIC
-    mov     dword [rdi + VMXVMCSBATCHCACHE.uPos], 12
+    mov     dword [rdi + VMXVMCSCACHE.uPos], 12
   %endif
 .skip_flags_save:
@@ -1169,10 +1169,10 @@
     pop     rdi         ; pCache
  %ifdef VBOX_WITH_CRASHDUMP_MAGIC
-    mov     dword [rdi + VMXVMCSBATCHCACHE.uPos], 10
+    mov     dword [rdi + VMXVMCSCACHE.uPos], 10
  %endif
 
  %ifdef DEBUG
-    mov     [rdi + VMXVMCSBATCHCACHE.TestOut.pCache], rdi
-    mov     [rdi + VMXVMCSBATCHCACHE.TestOut.pCtx], rsi
+    mov     [rdi + VMXVMCSCACHE.TestOut.pCache], rdi
+    mov     [rdi + VMXVMCSCACHE.TestOut.pCtx], rsi
  %endif
 %endif
@@ -1201,9 +1201,9 @@
 
  %ifdef DEBUG
-    mov     [rdi + VMXVMCSBATCHCACHE.TestOut.pCache], rdi
-    mov     [rdi + VMXVMCSBATCHCACHE.TestOut.pCtx], rsi
+    mov     [rdi + VMXVMCSCACHE.TestOut.pCache], rdi
+    mov     [rdi + VMXVMCSCACHE.TestOut.pCtx], rsi
  %endif
  %ifdef VBOX_WITH_CRASHDUMP_MAGIC
-    mov     dword [rdi + VMXVMCSBATCHCACHE.uPos], 11
+    mov     dword [rdi + VMXVMCSCACHE.uPos], 11
  %endif
 %endif