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

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

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (5 diffs)

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

@@ -1025 +1025 @@
 DECLINLINE(PVMXVMCSINFO) hmGetVmxActiveVmcsInfo(PVMCPUCC pVCpu)
 {
-    if (!pVCpu->hm.s.vmx.fSwitchedToNstGstVmcs)
+    if (!pVCpu->hmr0.s.vmx.fSwitchedToNstGstVmcs)
         return &pVCpu->hmr0.s.vmx.VmcsInfo;
     return &pVCpu->hmr0.s.vmx.VmcsInfoNstGst;
@@ -1398 +1398 @@
     if (RT_SUCCESS(rc))
     {
-        pVCpu->hm.s.vmx.fSwitchedToNstGstVmcs = fSwitchToNstGstVmcs;
+        pVCpu->hmr0.s.vmx.fSwitchedToNstGstVmcs     = fSwitchToNstGstVmcs;
+        pVCpu->hm.s.vmx.fSwitchedToNstGstVmcsShadow = fSwitchToNstGstVmcs;
 
         /*
@@ -9284 +9285 @@
     if (RT_SUCCESS(rc))
     {
-        pVCpu->hm.s.vmx.fSwitchedToNstGstVmcs = fInNestedGuestMode;
+        pVCpu->hmr0.s.vmx.fSwitchedToNstGstVmcs     = fInNestedGuestMode;
+        pVCpu->hm.s.vmx.fSwitchedToNstGstVmcsShadow = fInNestedGuestMode;
         pVCpu->hmr0.s.fLeaveDone = false;
         Log4Func(("Loaded Vmcs. HostCpuId=%u\n", RTMpCpuId()));
@@ -11283 +11285 @@
      * guest VMCS while entering the VMX ring-0 session.
      */
-    if (pVCpu->hm.s.vmx.fSwitchedToNstGstVmcs)
+    if (pVCpu->hmr0.s.vmx.fSwitchedToNstGstVmcs)
     {
         int rc = hmR0VmxSwitchToGstOrNstGstVmcs(pVCpu, false /* fSwitchToNstGstVmcs */);
@@ -11395 +11397 @@
      * loaded the nested-guest VMCS while entering the VMX ring-0 session.
      */
-    if (!pVCpu->hm.s.vmx.fSwitchedToNstGstVmcs)
+    if (!pVCpu->hmr0.s.vmx.fSwitchedToNstGstVmcs)
     {
         int rc = hmR0VmxSwitchToGstOrNstGstVmcs(pVCpu, true /* fSwitchToNstGstVmcs */);