Changeset 87488 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jan 29, 2021 6:17:10 PM (4 years ago)

Author:

vboxsync

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

142510

Message:

VMM/HMVMX: Moving more stuff to HMR0PERVCPU. bugref:9217

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• HMAll.cpp (modified) (1 diff)
• HMVMXAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/HMAll.cpp

@@ -776 +776 @@
  * @param   enmGuestMode    New guest paging mode.
  */
-VMM_INT_DECL(void) HMHCChangedPagingMode(PVM pVM, PVMCPU pVCpu, PGMMODE enmShadowMode, PGMMODE enmGuestMode)
+VMM_INT_DECL(void) HMHCChangedPagingMode(PVM pVM, PVMCPUCC pVCpu, PGMMODE enmShadowMode, PGMMODE enmGuestMode)
 {
 #ifdef IN_RING3

trunk/src/VBox/VMM/VMMAll/HMVMXAll.cpp

@@ -1103 +1103 @@
  * @remarks This function may be called with preemption or interrupts disabled!
  */
-VMM_INT_DECL(PVMXVMCSINFOSHARED) hmGetVmxActiveVmcsInfoShared(PVMCPU pVCpu)
+VMM_INT_DECL(PVMXVMCSINFOSHARED) hmGetVmxActiveVmcsInfoShared(PVMCPUCC pVCpu)
 {
-    if (!pVCpu->hm.s.vmx.fSwitchedToNstGstVmcs)
+#ifdef IN_RING0
+    if (!pVCpu->hmr0.s.vmx.fSwitchedToNstGstVmcs)
+#else
+    if (!pVCpu->hm.s.vmx.fSwitchedToNstGstVmcsShadow)
+#endif
         return &pVCpu->hm.s.vmx.VmcsInfo;
     return &pVCpu->hm.s.vmx.VmcsInfoNstGst;